diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-10-29 00:45:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-11-10 15:14:56 -0500 |
commit | 102e0572d330e6cdb89a8f8fbd3999e3c67a1f9e (patch) | |
tree | be8df3f62c3f506ea8cec1e5285b810b5f8461d8 /drivers/net/wireless/ath9k/recv.c | |
parent | 43453b3392c1ecfdd1471383ad42ba926533a722 (diff) |
ath9k: Ensure ath_node is not NULL when updating tx chainmask
Also, random indentation and whitespace cleanup.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath9k/recv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 27d6a981a106..80f26b4c4e06 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
@@ -356,8 +356,8 @@ static void ath_rx_timer(unsigned long data) | |||
356 | 356 | ||
357 | /* Free all pending sub-frames in the re-ordering buffer */ | 357 | /* Free all pending sub-frames in the re-ordering buffer */ |
358 | 358 | ||
359 | static void ath_rx_flush_tid(struct ath_softc *sc, | 359 | static void ath_rx_flush_tid(struct ath_softc *sc, struct ath_arx_tid *rxtid, |
360 | struct ath_arx_tid *rxtid, int drop) | 360 | int drop) |
361 | { | 361 | { |
362 | struct ath_rxbuf *rxbuf; | 362 | struct ath_rxbuf *rxbuf; |
363 | unsigned long flag; | 363 | unsigned long flag; |
@@ -1218,7 +1218,7 @@ void ath_rx_node_init(struct ath_softc *sc, struct ath_node *an) | |||
1218 | * (needs to be allocated when addba is received) | 1218 | * (needs to be allocated when addba is received) |
1219 | */ | 1219 | */ |
1220 | 1220 | ||
1221 | rxtid->rxbuf = NULL; | 1221 | rxtid->rxbuf = NULL; |
1222 | setup_timer(&rxtid->timer, ath_rx_timer, | 1222 | setup_timer(&rxtid->timer, ath_rx_timer, |
1223 | (unsigned long)rxtid); | 1223 | (unsigned long)rxtid); |
1224 | spin_lock_init(&rxtid->tidlock); | 1224 | spin_lock_init(&rxtid->tidlock); |