aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_event.c
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2009-10-08 14:56:30 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:47:53 -0400
commit66497dc3bd569e05a5bcb729d495eebad47aa46a (patch)
treebe1482332f96c2844ca45606d1a122bba9c4095d /drivers/net/wireless/wl12xx/wl1271_event.c
parenta64b07e8c6ff8394cd8c5a505b9f04d945f9f30f (diff)
wl1271: Clear probe-request template after scan
Clear the probe-request template on the firmware after scan. Unless cleared, the firmware can independently send probe requests to the AP and interfere with the mac80211 logic. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_event.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_event.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_event.c b/drivers/net/wireless/wl12xx/wl1271_event.c
index f3afd4a6ff33..87055f7996bc 100644
--- a/drivers/net/wireless/wl12xx/wl1271_event.c
+++ b/drivers/net/wireless/wl12xx/wl1271_event.c
@@ -26,6 +26,7 @@
26#include "wl1271_spi.h" 26#include "wl1271_spi.h"
27#include "wl1271_event.h" 27#include "wl1271_event.h"
28#include "wl1271_ps.h" 28#include "wl1271_ps.h"
29#include "wl12xx_80211.h"
29 30
30static int wl1271_event_scan_complete(struct wl1271 *wl, 31static int wl1271_event_scan_complete(struct wl1271 *wl,
31 struct event_mailbox *mbox) 32 struct event_mailbox *mbox)
@@ -34,6 +35,9 @@ static int wl1271_event_scan_complete(struct wl1271 *wl,
34 mbox->scheduled_scan_status); 35 mbox->scheduled_scan_status);
35 36
36 if (wl->scanning) { 37 if (wl->scanning) {
38 int size = sizeof(struct wl12xx_probe_req_template);
39 wl1271_cmd_template_set(wl, CMD_TEMPL_CFG_PROBE_REQ_2_4, NULL,
40 size);
37 mutex_unlock(&wl->mutex); 41 mutex_unlock(&wl->mutex);
38 ieee80211_scan_completed(wl->hw, false); 42 ieee80211_scan_completed(wl->hw, false);
39 mutex_lock(&wl->mutex); 43 mutex_lock(&wl->mutex);