Home » Mailing list archives » linux-kernel » 2007 » August » 22

[PATCH 1/2] Net: ath5k, no printk after STA->IBSS switch

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jiri Slaby <jirislaby@...>
To: Andrew Morton <akpm@...>
Cc: <linux-kernel@...>, <netdev@...>, <linville@...>, <linux-wireless@...>, <jeff@...>
Subject: [PATCH 1/2] Net: ath5k, no printk after STA-&gt;IBSS switch
Date: Wednesday, August 22, 2007 - 4:53 pm

ath5k, no printk after STA->IBSS switch

If STA->IBSS switch was done, but beacon_update weas not called so far, do
not emit a warning about non-existent skbuf.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit b01c0e9a02b248c3e2f2923da9728ba2c3961dee
tree c3e10a57aed39698f20c346679854aa3a9a54639
parent 8c5f91fb39c6208b23306687343cc5fbf830fa17
author Jiri Slaby <jirislaby@gmail.com> Wed, 22 Aug 2007 22:47:06 +0200
committer Jiri Slaby <jirislaby@gmail.com> Wed, 22 Aug 2007 22:47:06 +0200

 drivers/net/wireless/ath5k_base.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath5k_base.c b/drivers/net/wireless/ath5k_base.c
index 847218b..2ce82ed 100644
--- a/drivers/net/wireless/ath5k_base.c
+++ b/drivers/net/wireless/ath5k_base.c
@@ -655,7 +655,9 @@ static void ath_beacon_config(struct ath_softc *sc)
 	DPRINTF(sc, ATH_DEBUG_BEACON, "%s: intval %u hw tsftu %u\n", __func__,
 			intval, tsftu);
 
-	if (sc->opmode == IEEE80211_IF_TYPE_STA) {
+	if (sc->opmode == IEEE80211_IF_TYPE_STA ||
+			(sc->opmode == IEEE80211_IF_TYPE_IBSS &&
+				!sc->bbuf->skb)) {
 		ath5k_hw_set_intr(ah, 0);
 		sc->imask |= AR5K_INT_BMISS;
 		sc->bmisscount = 0;
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 1/2] Net: ath5k, no printk after STA->IBSS switch, Jiri Slaby, (Wed Aug 22, 4:53 pm)
[PATCH 2/2] Net: ath5k, remove sysctls, Jiri Slaby, (Wed Aug 22, 4:54 pm)