diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
| commit | 46bf695802bb090d9d0d0fec6bb5b46c24b17d4e (patch) | |
| tree | 788afdbec413608f6331ffbac4153f0f6736e6b7 /drivers/net/wireless/wl12xx/wl1271_scan.h | |
| parent | e7480bbb926c5816e4fbfca70748096bbe0e4978 (diff) | |
| parent | 4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1 (diff) | |
| download | blackbird-op-linux-46bf695802bb090d9d0d0fec6bb5b46c24b17d4e.tar.gz blackbird-op-linux-46bf695802bb090d9d0d0fec6bb5b46c24b17d4e.zip | |
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_scan.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_scan.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_scan.h b/drivers/net/wireless/wl12xx/wl1271_scan.h index f1815700f5f9..6d57127b5e6b 100644 --- a/drivers/net/wireless/wl12xx/wl1271_scan.h +++ b/drivers/net/wireless/wl12xx/wl1271_scan.h @@ -32,6 +32,7 @@ int wl1271_scan_build_probe_req(struct wl1271 *wl, const u8 *ssid, size_t ssid_len, const u8 *ie, size_t ie_len, u8 band); void wl1271_scan_stm(struct wl1271 *wl); +void wl1271_scan_complete_work(struct work_struct *work); #define WL1271_SCAN_MAX_CHANNELS 24 #define WL1271_SCAN_DEFAULT_TAG 1 @@ -39,11 +40,10 @@ void wl1271_scan_stm(struct wl1271 *wl); #define WL1271_SCAN_OPT_ACTIVE 0 #define WL1271_SCAN_OPT_PASSIVE 1 #define WL1271_SCAN_OPT_PRIORITY_HIGH 4 -#define WL1271_SCAN_CHAN_MIN_DURATION 30000 /* TU */ -#define WL1271_SCAN_CHAN_MAX_DURATION 60000 /* TU */ #define WL1271_SCAN_BAND_2_4_GHZ 0 #define WL1271_SCAN_BAND_5_GHZ 1 -#define WL1271_SCAN_PROBE_REQS 3 + +#define WL1271_SCAN_TIMEOUT 10000 /* msec */ enum { WL1271_SCAN_STATE_IDLE, |
