diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/scan.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/scan.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h index a0b6c5d67b07..ca81de20ebef 100644 --- a/drivers/net/wireless/wl12xx/scan.h +++ b/drivers/net/wireless/wl12xx/scan.h | |||
@@ -112,19 +112,14 @@ struct wl1271_cmd_trigger_scan_to { | |||
112 | __le32 timeout; | 112 | __le32 timeout; |
113 | } __packed; | 113 | } __packed; |
114 | 114 | ||
115 | #define MAX_CHANNELS_ALL_BANDS 41 | 115 | #define MAX_CHANNELS_2GHZ 14 |
116 | #define MAX_CHANNELS_5GHZ 23 | ||
117 | #define MAX_CHANNELS_4GHZ 4 | ||
118 | |||
116 | #define SCAN_MAX_CYCLE_INTERVALS 16 | 119 | #define SCAN_MAX_CYCLE_INTERVALS 16 |
117 | #define SCAN_MAX_BANDS 3 | 120 | #define SCAN_MAX_BANDS 3 |
118 | 121 | ||
119 | enum { | 122 | enum { |
120 | SCAN_CHANNEL_TYPE_2GHZ_PASSIVE, | ||
121 | SCAN_CHANNEL_TYPE_2GHZ_ACTIVE, | ||
122 | SCAN_CHANNEL_TYPE_5GHZ_PASSIVE, | ||
123 | SCAN_CHANNEL_TYPE_5GHZ_ACTIVE, | ||
124 | SCAN_CHANNEL_TYPE_5GHZ_DFS, | ||
125 | }; | ||
126 | |||
127 | enum { | ||
128 | SCAN_SSID_FILTER_ANY = 0, | 123 | SCAN_SSID_FILTER_ANY = 0, |
129 | SCAN_SSID_FILTER_SPECIFIC = 1, | 124 | SCAN_SSID_FILTER_SPECIFIC = 1, |
130 | SCAN_SSID_FILTER_LIST = 2, | 125 | SCAN_SSID_FILTER_LIST = 2, |
@@ -182,7 +177,9 @@ struct wl1271_cmd_sched_scan_config { | |||
182 | 177 | ||
183 | u8 padding[3]; | 178 | u8 padding[3]; |
184 | 179 | ||
185 | struct conn_scan_ch_params channels[MAX_CHANNELS_ALL_BANDS]; | 180 | struct conn_scan_ch_params channels_2[MAX_CHANNELS_2GHZ]; |
181 | struct conn_scan_ch_params channels_5[MAX_CHANNELS_5GHZ]; | ||
182 | struct conn_scan_ch_params channels_4[MAX_CHANNELS_4GHZ]; | ||
186 | } __packed; | 183 | } __packed; |
187 | 184 | ||
188 | 185 | ||