openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wl12xx: move aid into wlvif 

move aid 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>
This commit is contained in:
Eliad Peller 2011-10-05 11:55:50 +02:00 committed by Luciano Coelho
parent bddb29b83a
commit 6840e37aec
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/wl12xx/main.c
View File

@ -2217,7 +2217,7 @@ static int wl1271_join(struct wl1271 *wl, struct wl12xx_vif *wlvif,
if (ret < 0) if (ret < 0)
goto out; goto out;
ret = wl1271_acx_aid(wl, wl->aid); ret = wl1271_acx_aid(wl, wlvif->aid);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -3487,7 +3487,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
if (bss_conf->assoc) { if (bss_conf->assoc) {
u32 rates; u32 rates;
int ieoffset; int ieoffset;
wl->aid = bss_conf->aid; wlvif->aid = bss_conf->aid;
set_assoc = true; set_assoc = true;
wl->ps_poll_failures = 0; wl->ps_poll_failures = 0;
@ -3518,7 +3518,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
* updates it by itself when the first beacon is * updates it by itself when the first beacon is
* received after a join. * received after a join.
*/ */
ret = wl1271_cmd_build_ps_poll(wl, wlvif, wl->aid); ret = wl1271_cmd_build_ps_poll(wl, wlvif, wlvif->aid);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -3544,7 +3544,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
bool was_ifup = bool was_ifup =
!!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT, !!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT,
&wl->flags); &wl->flags);
wl->aid = 0; wlvif->aid = 0;
/* free probe-request template */ /* free probe-request template */
dev_kfree_skb(wlvif->probereq); dev_kfree_skb(wlvif->probereq);

6
drivers/net/wireless/wl12xx/wl12xx.h
View File

@ -507,9 +507,6 @@ struct wl1271 {
bool sched_scanning; bool sched_scanning;
/* Our association ID */
u16 aid;
u32 bitrate_masks[IEEE80211_NUM_BANDS]; u32 bitrate_masks[IEEE80211_NUM_BANDS];
/* The current band */ /* The current band */
@ -641,6 +638,9 @@ struct wl12xx_vif {
/* probe-req template for the current AP */ /* probe-req template for the current AP */
struct sk_buff *probereq; struct sk_buff *probereq;
/* Our association ID */
u16 aid;
}; };
static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif) static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)