raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2026-01-04 10:21:00 +00:00
Code Issues Projects Releases Wiki Activity

wl12xx: move probereq into wlvif

Browse Source 
move probereq 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>
This commit is contained in:
Eliad Peller
2011-10-05 11:55:49 +02:00
committed by Luciano Coelho
parent 1fe9f1616e
commit bddb29b83a
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/wl12xx/main.c
View File

@@ -3525,11 +3525,12 @@ sta_not_found:
/*
* Get a template for hardware connection maintenance
*/
dev_kfree_skb(wl->probereq);
wl->probereq = wl1271_cmd_build_ap_probe_req(wl, NULL);
dev_kfree_skb(wlvif->probereq);
wlvif->probereq = wl1271_cmd_build_ap_probe_req(wl,
NULL);
ieoffset = offsetof(struct ieee80211_mgmt,
u.probe_req.variable);
wl1271_ssid_set(vif, wl->probereq, ieoffset);
wl1271_ssid_set(vif, wlvif->probereq, ieoffset);
/* enable the connection monitoring feature */
ret = wl1271_acx_conn_monit_params(wl, true);
@@ -3546,8 +3547,8 @@ sta_not_found:
wl->aid = 0;
/* free probe-request template */
dev_kfree_skb(wl->probereq);
wl->probereq = NULL;
dev_kfree_skb(wlvif->probereq);
wlvif->probereq = NULL;
/* re-enable dynamic ps - just in case */
ieee80211_enable_dyn_ps(wl->vif);

2
drivers/net/wireless/wl12xx/scan.c
View File

@@ -64,7 +64,7 @@ void wl1271_scan_complete_work(struct work_struct *work)
if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {
/* restore hardware connection monitoring template */
wl1271_cmd_build_ap_probe_req(wl, wl->probereq);
wl1271_cmd_build_ap_probe_req(wl, wlvif->probereq);
}
/* return to ROC if needed */

6
drivers/net/wireless/wl12xx/wl12xx.h
View File

@@ -507,9 +507,6 @@ struct wl1271 {
bool sched_scanning;
/* probe-req template for the current AP */
struct sk_buff *probereq;
/* Our association ID */
u16 aid;
@@ -641,6 +638,9 @@ struct wl12xx_vif {
*/
u32 basic_rate;
u32 rate_set;
/* probe-req template for the current AP */
struct sk_buff *probereq;
};
static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)