aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/tx.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/tx.c')
-rw-r--r--drivers/net/wireless/wl12xx/tx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index 5561ec2d4b4f..538d8613b324 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -77,7 +77,8 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id)
77} 77}
78 78
79static int wl1271_tx_update_filters(struct wl1271 *wl, 79static int wl1271_tx_update_filters(struct wl1271 *wl,
80 struct sk_buff *skb) 80 struct wl12xx_vif *wlvif,
81 struct sk_buff *skb)
81{ 82{
82 struct ieee80211_hdr *hdr; 83 struct ieee80211_hdr *hdr;
83 int ret; 84 int ret;
@@ -97,11 +98,11 @@ static int wl1271_tx_update_filters(struct wl1271 *wl,
97 goto out; 98 goto out;
98 99
99 wl1271_debug(DEBUG_CMD, "starting device role for roaming"); 100 wl1271_debug(DEBUG_CMD, "starting device role for roaming");
100 ret = wl12xx_cmd_role_start_dev(wl); 101 ret = wl12xx_cmd_role_start_dev(wl, wlvif);
101 if (ret < 0) 102 if (ret < 0)
102 goto out; 103 goto out;
103 104
104 ret = wl12xx_roc(wl, wl->dev_role_id); 105 ret = wl12xx_roc(wl, wlvif->dev_role_id);
105 if (ret < 0) 106 if (ret < 0)
106 goto out; 107 goto out;
107out: 108out:
@@ -192,7 +193,7 @@ static u8 wl1271_tx_get_hlid(struct wl1271 *wl, struct ieee80211_vif *vif,
192 if (wlvif->bss_type == BSS_TYPE_AP_BSS) 193 if (wlvif->bss_type == BSS_TYPE_AP_BSS)
193 return wl12xx_tx_get_hlid_ap(wl, skb); 194 return wl12xx_tx_get_hlid_ap(wl, skb);
194 195
195 wl1271_tx_update_filters(wl, skb); 196 wl1271_tx_update_filters(wl, wlvif, skb);
196 197
197 if ((test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) || 198 if ((test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags) ||
198 test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags)) && 199 test_bit(WL1271_FLAG_IBSS_JOINED, &wl->flags)) &&