diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-07 04:49:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-07 04:49:55 +0200 |
| commit | 080fff50a3bd669dbc16261602055a157fe89583 (patch) | |
| tree | 25c3924af2d09d1089b800707f91196b89b408dc /include/net | |
| parent | ethernet: synopsys: SYNOPSYS_DWC_ETH_QOS should depend on HAS_DMA (diff) | |
| parent | mac80211: reject software RSSI CQM with beacon filtering (diff) | |
| download | linux-080fff50a3bd669dbc16261602055a157fe89583.tar.xz linux-080fff50a3bd669dbc16261602055a157fe89583.zip | |
Merge tag 'mac80211-for-davem-2015-09-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
For the first round of fixes, we have this:
* fix for the sizeof() pointer type issue
* a fix for regulatory getting into a restore loop
* a fix for rfkill global 'all' state, it needs to be stored
everywhere to apply correctly to new rfkill instances
* properly refuse CQM RSSI when it cannot actually be used
* protect HT TDLS traffic properly in non-HT networks
* don't incorrectly advertise 80 MHz support when not allowed
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index e3314e516681..bfc569498bfa 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -477,7 +477,9 @@ struct ieee80211_event { * @chandef: Channel definition for this BSS -- the hardware might be * configured a higher bandwidth than this BSS uses, for example. * @ht_operation_mode: HT operation mode like in &struct ieee80211_ht_operation. - * This field is only valid when the channel type is one of the HT types. + * This field is only valid when the channel is a wide HT/VHT channel. + * Note that with TDLS this can be the case (channel is HT, protection must + * be used from this field) even when the BSS association isn't using HT. * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value * implies disabled * @cqm_rssi_hyst: Connection quality monitor RSSI hysteresis |