diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-12-16 19:26:11 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-16 19:26:11 -0800 |
| commit | ad125c6c05921091daf8ac6f01b5665d5401741b (patch) | |
| tree | 2e4b53884b3cde9ad54d759018ba4aec7929a291 /include | |
| parent | net: dsa: ocelot: add NET_VENDOR_MICROSEMI dependency (diff) | |
| parent | rfkill: Fix incorrect check to avoid NULL pointer dereference (diff) | |
| download | linux-dev-ad125c6c05921091daf8ac6f01b5665d5401741b.tar.xz linux-dev-ad125c6c05921091daf8ac6f01b5665d5401741b.zip | |
Merge tag 'mac80211-for-net-2019-10-16' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
A handful of fixes:
* disable AQL on most drivers, addressing the iwlwifi issues
* fix double-free on network namespace changes
* fix TID field in frames injected through monitor interfaces
* fix ieee80211_calc_rx_airtime()
* fix NULL pointer dereference in rfkill (and remove BUG_ON)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/nl80211.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 341e0e8cae46..5eab191607f8 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -5517,6 +5517,10 @@ enum nl80211_feature_flags { * with VLAN tagged frames and separate VLAN-specific netdevs added using * vconfig similarly to the Ethernet case. * + * @NL80211_EXT_FEATURE_AQL: The driver supports the Airtime Queue Limit (AQL) + * feature, which prevents bufferbloat by using the expected transmission + * time to limit the amount of data buffered in the hardware. + * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index. */ @@ -5563,6 +5567,7 @@ enum nl80211_ext_feature_index { NL80211_EXT_FEATURE_STA_TX_PWR, NL80211_EXT_FEATURE_SAE_OFFLOAD, NL80211_EXT_FEATURE_VLAN_OFFLOAD, + NL80211_EXT_FEATURE_AQL, /* add new features before the definition below */ NUM_NL80211_EXT_FEATURES, |