diff options
| author | Luciano Coelho | 2010-07-08 16:50:07 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-07-08 22:42:09 +0200 |
| commit | 08688d6b1a85484cc8e4a920afc60ffa6559999d (patch) | |
| tree | 351ee3682ce623e15627df59aa50935ab6159ffe /drivers/net/wireless/wl12xx/wl1271.h | |
| parent | wl1271: moved scan operations to a separate file (diff) | |
| download | kernel-qcow2-linux-08688d6b1a85484cc8e4a920afc60ffa6559999d.tar.gz kernel-qcow2-linux-08688d6b1a85484cc8e4a920afc60ffa6559999d.tar.xz kernel-qcow2-linux-08688d6b1a85484cc8e4a920afc60ffa6559999d.zip | |
wl1271: rewritten scanning code
This patch is a complete rewrite of the scanning code. It now includes a
state machine to scan all four possible sets of channels independently:
2.4GHz active, 2.4GHz passive, 5GHz active and 5GHz passive. The wl1271
firmware doesn't allow these sets to be mixed, so up to several scan commands
have to be issued. This patch also allows scanning more than 24 channels per
set, by breaking the sets into smaller parts if needed (the firmware can scan
a maximum of 24 channels at a time).
Previously, the scanning code was erroneously scanning all channels possible
actively, not complying with the CRDA values. This is also fixed with this
patch.
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Saravanan Dhanabal <ext-saravanan.dhanabal@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h index cfdccdb86067..b7c2995d4f40 100644 --- a/drivers/net/wireless/wl12xx/wl1271.h +++ b/drivers/net/wireless/wl12xx/wl1271.h @@ -300,12 +300,10 @@ struct wl1271_rx_mem_pool_addr { struct wl1271_scan { struct cfg80211_scan_request *req; + bool *scanned_ch; u8 state; u8 ssid[IW_ESSID_MAX_SIZE+1]; size_t ssid_len; - u8 active; - u8 high_prio; - u8 probe_requests; }; struct wl1271_if_operations { @@ -343,15 +341,14 @@ struct wl1271 { #define WL1271_FLAG_JOINED (2) #define WL1271_FLAG_GPIO_POWER (3) #define WL1271_FLAG_TX_QUEUE_STOPPED (4) -#define WL1271_FLAG_SCANNING (5) -#define WL1271_FLAG_IN_ELP (6) -#define WL1271_FLAG_PSM (7) -#define WL1271_FLAG_PSM_REQUESTED (8) -#define WL1271_FLAG_IRQ_PENDING (9) -#define WL1271_FLAG_IRQ_RUNNING (10) -#define WL1271_FLAG_IDLE (11) -#define WL1271_FLAG_IDLE_REQUESTED (12) -#define WL1271_FLAG_PSPOLL_FAILURE (13) +#define WL1271_FLAG_IN_ELP (5) +#define WL1271_FLAG_PSM (6) +#define WL1271_FLAG_PSM_REQUESTED (7) +#define WL1271_FLAG_IRQ_PENDING (8) +#define WL1271_FLAG_IRQ_RUNNING (9) +#define WL1271_FLAG_IDLE (10) +#define WL1271_FLAG_IDLE_REQUESTED (11) +#define WL1271_FLAG_PSPOLL_FAILURE (12) unsigned long flags; struct wl1271_partition_set part; |