summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 13:55:45 +0400
committerLuciano Coelho <coelho@ti.com>2011-10-07 09:32:37 +0400
commit536129c8ad35de87ff2f864f205a54ac32bfebcc (patch)
tree0d9b40906e00bf2a11a692262d1094161d770e63 /drivers/net/wireless/wl12xx/wl12xx.h
parentcdf09495588fda7e9c15c25bc20cb828e07be314 (diff)
downloadlinux-536129c8ad35de87ff2f864f205a54ac32bfebcc.tar.xz
wl12xx: move bss_type into wlvif
move bss_type 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.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 44a5daeff07e..97ed19c67695 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -400,7 +400,6 @@ struct wl1271 {
s8 hw_pg_ver;
u8 mac_addr[ETH_ALEN];
- u8 bss_type;
u8 set_bss_type;
u8 p2p; /* we are using p2p role */
u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
@@ -630,6 +629,8 @@ struct wl1271_station {
};
struct wl12xx_vif {
+ u8 bss_type;
+
u32 basic_rate_set;
/*