diff options
author | Eliad Peller <eliad@wizery.com> | 2011-10-05 11:55:50 +0200 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2011-10-07 08:32:41 +0300 |
commit | 6840e37aec6fd9ffa5b4cf62674af55afdb565ed (patch) | |
tree | 696516782f76f4803aa5c257ce4953e9d45c9177 /drivers/net/wireless/wl12xx/wl12xx.h | |
parent | bddb29b83a9874fda21c34abe7627cbf14fec10e (diff) |
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>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h index 8d100561522..e6d3c214acf 100644 --- a/drivers/net/wireless/wl12xx/wl12xx.h +++ b/drivers/net/wireless/wl12xx/wl12xx.h @@ -507,9 +507,6 @@ struct wl1271 { bool sched_scanning; - /* Our association ID */ - u16 aid; - u32 bitrate_masks[IEEE80211_NUM_BANDS]; /* The current band */ @@ -641,6 +638,9 @@ struct wl12xx_vif { /* probe-req template for the current AP */ struct sk_buff *probereq; + + /* Our association ID */ + u16 aid; }; static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif) |