diff options
author | Eliad Peller <eliad@wizery.com> | 2011-10-05 05:56:04 -0400 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-10-07 01:32:54 -0400 |
commit | d0802abdf9c60b1dadb097e806022f3449b0cc6b (patch) | |
tree | 7e8c8d4480a3aa44073224f17a4bc46ad26d145e /drivers/net/wireless/wl12xx/event.c | |
parent | 04324d99818d16da4f64e266b45cad2e5803b961 (diff) |
wl12xx: move ba fields into wlvif
move ba_fields into the per-interface data, rather than
being global.
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/event.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/event.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/event.c b/drivers/net/wireless/wl12xx/event.c index 775ad952ac8f..8c31274228ea 100644 --- a/drivers/net/wireless/wl12xx/event.c +++ b/drivers/net/wireless/wl12xx/event.c | |||
@@ -184,9 +184,9 @@ static void wl1271_event_rssi_trigger(struct wl1271 *wl, | |||
184 | static void wl1271_stop_ba_event(struct wl1271 *wl, struct wl12xx_vif *wlvif) | 184 | static void wl1271_stop_ba_event(struct wl1271 *wl, struct wl12xx_vif *wlvif) |
185 | { | 185 | { |
186 | if (wlvif->bss_type != BSS_TYPE_AP_BSS) { | 186 | if (wlvif->bss_type != BSS_TYPE_AP_BSS) { |
187 | if (!wl->ba_rx_bitmap) | 187 | if (!wlvif->sta.ba_rx_bitmap) |
188 | return; | 188 | return; |
189 | ieee80211_stop_rx_ba_session(wl->vif, wl->ba_rx_bitmap, | 189 | ieee80211_stop_rx_ba_session(wl->vif, wlvif->sta.ba_rx_bitmap, |
190 | wl->vif->bss_conf.bssid); | 190 | wl->vif->bss_conf.bssid); |
191 | } else { | 191 | } else { |
192 | int i; | 192 | int i; |
@@ -306,9 +306,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox) | |||
306 | wl1271_debug(DEBUG_EVENT, "BA_SESSION_RX_CONSTRAINT_EVENT_ID. " | 306 | wl1271_debug(DEBUG_EVENT, "BA_SESSION_RX_CONSTRAINT_EVENT_ID. " |
307 | "ba_allowed = 0x%x", mbox->rx_ba_allowed); | 307 | "ba_allowed = 0x%x", mbox->rx_ba_allowed); |
308 | 308 | ||
309 | wl->ba_allowed = !!mbox->rx_ba_allowed; | 309 | wlvif->ba_allowed = !!mbox->rx_ba_allowed; |
310 | 310 | ||
311 | if (wl->vif && !wl->ba_allowed) | 311 | if (wl->vif && !wlvif->ba_allowed) |
312 | wl1271_stop_ba_event(wl, wlvif); | 312 | wl1271_stop_ba_event(wl, wlvif); |
313 | } | 313 | } |
314 | 314 | ||