aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 11:55:58 +0200
committerLuciano Coelho <coelho@ti.com>2011-10-07 08:32:48 +0300
commit6a8997964366f51c39d8efcfdc0e6319b2bd01fa (patch)
tree64e5ba7a2424fba1fd31e7399043cf23d025dec0 /drivers/net/wireless/wl12xx/wl12xx.h
parentafaf8bdb2b08bbf493b03757243821df72b26c53 (diff)
wl12xx: move beacon_int into wlvif
move beacon_int 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.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 752b6b99210..9d4b72e96c2 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -503,9 +503,6 @@ struct wl1271 {
/* The current band */
enum ieee80211_band band;
- /* Beaconing interval (needed for ad-hoc) */
- u32 beacon_int;
-
/* Default key (for WEP) */
u32 default_key;
@@ -645,6 +642,9 @@ struct wl12xx_vif {
/* probe-req template for the current AP */
struct sk_buff *probereq;
+ /* Beaconing interval (needed for ad-hoc) */
+ u32 beacon_int;
+
/* Our association ID */
u16 aid;