summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 13:55:51 +0400
committerLuciano Coelho <coelho@ti.com>2011-10-07 09:32:42 +0400
commit0603d891c5b5153f667a79357d4652824c22b54e (patch)
treea5662e776f2609db07d05415d65c5fa74a0ef564 /drivers/net/wireless/wl12xx/wl12xx.h
parent6840e37aec6fd9ffa5b4cf62674af55afdb565ed (diff)
downloadlinux-0603d891c5b5153f667a79357d4652824c22b54e.tar.xz
wl12xx: move role_id into wlvif
move role_id 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index e6d3c214acf9..e249b459f62b 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -401,7 +401,6 @@ struct wl1271 {
u8 mac_addr[ETH_ALEN];
int channel;
- u8 role_id;
u8 dev_role_id;
u8 system_hlid;
u8 sta_hlid;
@@ -621,6 +620,7 @@ struct wl1271_station {
struct wl12xx_vif {
u8 bss_type;
u8 p2p; /* we are using p2p role */
+ u8 role_id;
u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 ssid_len;