diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-10 13:12:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-06-10 13:12:02 -0400 |
| commit | 93ea927eb15b736fa4a431f789b1097318129d2a (patch) | |
| tree | b141a0e06c9d1616dc7f0c616a96655afd32f8b0 /drivers/net/wireless/wl12xx/scan.h | |
| parent | dbcb4a1a3f16702918caa4d4ab7062965050a780 (diff) | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
Merge tag 'v3.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'drivers/net/wireless/wl12xx/scan.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/scan.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/scan.h b/drivers/net/wireless/wl12xx/scan.h index c83319579ca3..a0b6c5d67b07 100644 --- a/drivers/net/wireless/wl12xx/scan.h +++ b/drivers/net/wireless/wl12xx/scan.h | |||
| @@ -137,6 +137,9 @@ enum { | |||
| 137 | SCAN_BSS_TYPE_ANY, | 137 | SCAN_BSS_TYPE_ANY, |
| 138 | }; | 138 | }; |
| 139 | 139 | ||
| 140 | #define SCAN_CHANNEL_FLAGS_DFS BIT(0) | ||
| 141 | #define SCAN_CHANNEL_FLAGS_DFS_ENABLED BIT(1) | ||
| 142 | |||
| 140 | struct conn_scan_ch_params { | 143 | struct conn_scan_ch_params { |
| 141 | __le16 min_duration; | 144 | __le16 min_duration; |
| 142 | __le16 max_duration; | 145 | __le16 max_duration; |