diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 14:42:08 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 14:42:08 +1000 |
| commit | fc6c79662fe46a2451be825105abea3be6d566f5 (patch) | |
| tree | cf43622fa5dcecc1a9c3459c7896ba188dc9f54f /include | |
| parent | 4fb88c3a1e165f323769061dda865790864a71c7 (diff) | |
| parent | 18d7260527ce7c0d0a177afdf92d8f868f50b067 (diff) | |
Merge commit 'wireless/master'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 6a6c4bc3f6c4..3a204acad901 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -719,6 +719,10 @@ enum ieee80211_tkip_key_type { * @IEEE80211_HW_NOISE_DBM: * Hardware can provide noise (radio interference) values in units dBm, * decibel difference from one milliwatt. + * + * @IEEE80211_HW_SPECTRUM_MGMT: + * Hardware supports spectrum management defined in 802.11h + * Measurement, Channel Switch, Quieting, TPC */ enum ieee80211_hw_flags { IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE = 1<<0, @@ -730,6 +734,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SIGNAL_DB = 1<<6, IEEE80211_HW_SIGNAL_DBM = 1<<7, IEEE80211_HW_NOISE_DBM = 1<<8, + IEEE80211_HW_SPECTRUM_MGMT = 1<<9, }; /** |