summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/event.c
diff options
context:
space:
mode:
authorEliad Peller2011-10-05 11:56:04 +0200
committerLuciano Coelho2011-10-07 07:32:54 +0200
commitd0802abdf9c60b1dadb097e806022f3449b0cc6b (patch)
tree7e8c8d4480a3aa44073224f17a4bc46ad26d145e /drivers/net/wireless/wl12xx/event.c
parentwl12xx: move rssi_thold and last_rssi_event into wlvif (diff)
downloadkernel-qcow2-linux-d0802abdf9c60b1dadb097e806022f3449b0cc6b.tar.gz
kernel-qcow2-linux-d0802abdf9c60b1dadb097e806022f3449b0cc6b.tar.xz
kernel-qcow2-linux-d0802abdf9c60b1dadb097e806022f3449b0cc6b.zip
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.c8
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,
static void wl1271_stop_ba_event(struct wl1271 *wl, struct wl12xx_vif *wlvif)
{
if (wlvif->bss_type != BSS_TYPE_AP_BSS) {
- if (!wl->ba_rx_bitmap)
+ if (!wlvif->sta.ba_rx_bitmap)
return;
- ieee80211_stop_rx_ba_session(wl->vif, wl->ba_rx_bitmap,
+ ieee80211_stop_rx_ba_session(wl->vif, wlvif->sta.ba_rx_bitmap,
wl->vif->bss_conf.bssid);
} else {
int i;
@@ -306,9 +306,9 @@ static int wl1271_event_process(struct wl1271 *wl, struct event_mailbox *mbox)
wl1271_debug(DEBUG_EVENT, "BA_SESSION_RX_CONSTRAINT_EVENT_ID. "
"ba_allowed = 0x%x", mbox->rx_ba_allowed);
- wl->ba_allowed = !!mbox->rx_ba_allowed;
+ wlvif->ba_allowed = !!mbox->rx_ba_allowed;
- if (wl->vif && !wl->ba_allowed)
+ if (wl->vif && !wlvif->ba_allowed)
wl1271_stop_ba_event(wl, wlvif);
}