diff options
| author | Sujith <Sujith.Manoharan@atheros.com> | 2010-05-06 14:45:47 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-07 14:55:52 -0400 |
| commit | 9c6dda4e2dfea970a7105e3805f0195bc3079f2f (patch) | |
| tree | 3b255fefdca205e5f38032236faeb1d7e433a2a8 /drivers/net/wireless/ath/ath9k/htc.h | |
| parent | 0aaffa9b9699894aab3266195a529baf9f96ac29 (diff) | |
| download | linux-stable-9c6dda4e2dfea970a7105e3805f0195bc3079f2f.tar.gz linux-stable-9c6dda4e2dfea970a7105e3805f0195bc3079f2f.tar.bz2 linux-stable-9c6dda4e2dfea970a7105e3805f0195bc3079f2f.zip | |
ath9k_htc: Fix beaconing in IBSS mode
The current way of managing beaconing in ad-hoc
mode has a subtle race - the beacon obtained from mac80211
is freed in the SWBA handler rather than the TX
completion routine. But transmission of beacons goes
through the normal SKB queue maintained in hif_usb,
leading to a situation where __skb_dequeue() in the TX
completion handler goes kaput.
Fix this by simply getting a beacon from mac80211 for
every SWBA and free it in its completion routine.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 1ae18bbc4d9e..ad556aa8da39 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h @@ -356,7 +356,6 @@ struct ath9k_htc_priv { u16 seq_no; u32 bmiss_cnt; - struct sk_buff *beacon; spinlock_t beacon_lock; bool tx_queues_stop; @@ -408,13 +407,13 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz) void ath9k_htc_beacon_config(struct ath9k_htc_priv *priv, struct ieee80211_vif *vif); void ath9k_htc_swba(struct ath9k_htc_priv *priv, u8 beacon_pending); -void ath9k_htc_beacon_update(struct ath9k_htc_priv *priv, - struct ieee80211_vif *vif); void ath9k_htc_rxep(void *priv, struct sk_buff *skb, enum htc_endpoint_id ep_id); void ath9k_htc_txep(void *priv, struct sk_buff *skb, enum htc_endpoint_id ep_id, bool txok); +void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb, + enum htc_endpoint_id ep_id, bool txok); void ath9k_htc_station_work(struct work_struct *work); void ath9k_htc_aggr_work(struct work_struct *work); |