wl12xx: move sta_hlid into wlvif
move sta_hlid 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>
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 4c69ae1..a1084d1 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -402,7 +402,6 @@
u8 mac_addr[ETH_ALEN];
int channel;
u8 system_hlid;
- u8 sta_hlid;
u8 dev_hlid;
u8 ap_global_hlid;
u8 ap_bcast_hlid;
@@ -624,6 +623,12 @@
/* sta/ibss specific */
u8 dev_role_id;
+ union {
+ struct {
+ u8 hlid;
+ } sta;
+ };
+
u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 ssid_len;