diff options
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r-- | include/net/mac80211.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index e2144f0e8728..409e2c69269d 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -860,11 +860,6 @@ enum ieee80211_tkip_key_type { | |||
860 | * expect values between 0 and @max_signal. | 860 | * expect values between 0 and @max_signal. |
861 | * If possible please provide dB or dBm instead. | 861 | * If possible please provide dB or dBm instead. |
862 | * | 862 | * |
863 | * @IEEE80211_HW_SIGNAL_DB: | ||
864 | * Hardware gives signal values in dB, decibel difference from an | ||
865 | * arbitrary, fixed reference. We expect values between 0 and @max_signal. | ||
866 | * If possible please provide dBm instead. | ||
867 | * | ||
868 | * @IEEE80211_HW_SIGNAL_DBM: | 863 | * @IEEE80211_HW_SIGNAL_DBM: |
869 | * Hardware gives signal values in dBm, decibel difference from | 864 | * Hardware gives signal values in dBm, decibel difference from |
870 | * one milliwatt. This is the preferred method since it is standardized | 865 | * one milliwatt. This is the preferred method since it is standardized |
@@ -900,15 +895,14 @@ enum ieee80211_hw_flags { | |||
900 | IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE = 1<<3, | 895 | IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE = 1<<3, |
901 | IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE = 1<<4, | 896 | IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE = 1<<4, |
902 | IEEE80211_HW_SIGNAL_UNSPEC = 1<<5, | 897 | IEEE80211_HW_SIGNAL_UNSPEC = 1<<5, |
903 | IEEE80211_HW_SIGNAL_DB = 1<<6, | 898 | IEEE80211_HW_SIGNAL_DBM = 1<<6, |
904 | IEEE80211_HW_SIGNAL_DBM = 1<<7, | 899 | IEEE80211_HW_NOISE_DBM = 1<<7, |
905 | IEEE80211_HW_NOISE_DBM = 1<<8, | 900 | IEEE80211_HW_SPECTRUM_MGMT = 1<<8, |
906 | IEEE80211_HW_SPECTRUM_MGMT = 1<<9, | 901 | IEEE80211_HW_AMPDU_AGGREGATION = 1<<9, |
907 | IEEE80211_HW_AMPDU_AGGREGATION = 1<<10, | 902 | IEEE80211_HW_SUPPORTS_PS = 1<<10, |
908 | IEEE80211_HW_SUPPORTS_PS = 1<<11, | 903 | IEEE80211_HW_PS_NULLFUNC_STACK = 1<<11, |
909 | IEEE80211_HW_PS_NULLFUNC_STACK = 1<<12, | 904 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS = 1<<12, |
910 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS = 1<<13, | 905 | IEEE80211_HW_MFP_CAPABLE = 1<<13, |
911 | IEEE80211_HW_MFP_CAPABLE = 1<<14, | ||
912 | }; | 906 | }; |
913 | 907 | ||
914 | /** | 908 | /** |