summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-10-05 11:56:00 +0200
committerLuciano Coelho <coelho@ti.com>2011-10-07 08:32:50 +0300
commit252efa4f978a2901039fffc934060fb8ccf82ac7 (patch)
tree919f33de17e038696e38a8e772438c05f2143493 /drivers/net/wireless/wl12xx/wl12xx.h
parentf75c753f3c77b758fa5ace90c15b2ea3b7a3d46d (diff)
downloadblackbird-op-linux-252efa4f978a2901039fffc934060fb8ccf82ac7.tar.gz
blackbird-op-linux-252efa4f978a2901039fffc934060fb8ccf82ac7.zip
wl12xx: move pspoll_work into wlvif
move pspoll_work 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.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 91e6cd36bf8b..d6d5a7bff315 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -511,7 +511,6 @@ struct wl1271 {
struct completion *elp_compl;
struct completion *ps_compl;
struct delayed_work elp_work;
- struct delayed_work pspoll_work;
/* counter for ps-poll delivery failures */
int ps_poll_failures;
@@ -604,6 +603,7 @@ struct wl1271_station {
};
struct wl12xx_vif {
+ struct wl1271 *wl;
u8 bss_type;
u8 p2p; /* we are using p2p role */
u8 role_id;
@@ -650,6 +650,8 @@ struct wl12xx_vif {
/* Session counter for the chipset */
int session_counter;
+
+ struct delayed_work pspoll_work;
};
static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)
OpenPOWER on IntegriCloud