diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-10-13 10:28:16 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-10-13 10:28:43 +0200 |
| commit | 985f2c87a7109a42cac93f56ea595353d53a1746 (patch) | |
| tree | 69fe0acbbfeb6a348d6f4c64750d278e56b935b3 /include/net/mac80211.h | |
| parent | 4d57c67827d7bb79c4fcf6618bf80930808e50c6 (diff) | |
| parent | 6623c60dc28ee966cd85c6f12aa2fc3c952d0179 (diff) | |
| download | lwn-985f2c87a7109a42cac93f56ea595353d53a1746.tar.gz lwn-985f2c87a7109a42cac93f56ea595353d53a1746.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next to get some driver changes that patches depend
on (in order to avoid conflicts).
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/mac80211.h')
| -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 301fceb2fd10..4ec6fedeb220 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -478,7 +478,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 |