summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 11:55:57 +0200
committerLuciano Coelho <coelho@ti.com>2011-10-07 08:32:47 +0300
commitafaf8bdb2b08bbf493b03757243821df72b26c53 (patch)
tree40559a05c2be90301d9a579a9fe557dd79251ac3 /drivers/net/wireless/wl12xx/wl12xx.h
parente936bbe0dc235458408c060deaa43f5b8b0bd705 (diff)
wl12xx: move dev_hlid into wlvif
move dev_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>
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 9fcaa03cd73..752b6b99210 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -402,7 +402,6 @@ struct wl1271 {
u8 mac_addr[ETH_ALEN];
int channel;
u8 system_hlid;
- u8 dev_hlid;
unsigned long links_map[BITS_TO_LONGS(WL12XX_MAX_LINKS)];
unsigned long roles_map[BITS_TO_LONGS(WL12XX_MAX_ROLES)];
@@ -617,6 +616,7 @@ struct wl12xx_vif {
/* sta/ibss specific */
u8 dev_role_id;
+ u8 dev_hlid;
union {
struct {