[openwrt/openwrt] mac80211: do not allow bigger VHT MPDUs than the hardware supports

[LEDE Commits]

xback pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/6696fddfd9167d3d53cf2dc3ba8f9ad4c9aaeae9

commit 6696fddfd9167d3d53cf2dc3ba8f9ad4c9aaeae9
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Sep 17 12:09:23 2020 +0200

    mac80211: do not allow bigger VHT MPDUs than the hardware supports
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
    (cherry picked from commit caf727767ab5c8f8d884ef458c74726a8e610d96)
    [Refreshed patch]
    Signed-off-by: Koen Vandeputte <koen.vandeputte at ncentric.com>
---
 ...-not-allow-bigger-VHT-MPDUs-than-the-hard.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/package/kernel/mac80211/patches/subsys/331-mac80211-do-not-allow-bigger-VHT-MPDUs-than-the-hard.patch b/package/kernel/mac80211/patches/subsys/331-mac80211-do-not-allow-bigger-VHT-MPDUs-than-the-hard.patch
new file mode 100644
index 0000000000..ce39fe0d8b
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/331-mac80211-do-not-allow-bigger-VHT-MPDUs-than-the-hard.patch
@@ -0,0 +1,34 @@
+From: Felix Fietkau <nbd at nbd.name>
+Date: Thu, 17 Sep 2020 12:07:19 +0200
+Subject: [PATCH] mac80211: do not allow bigger VHT MPDUs than the hardware
+ supports
+
+Limit maximum VHT MPDU size by local capability
+
+Signed-off-by: Felix Fietkau <nbd at nbd.name>
+---
+
+--- a/net/mac80211/vht.c
++++ b/net/mac80211/vht.c
+@@ -170,10 +170,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru
+ 	/* take some capabilities as-is */
+ 	cap_info = le32_to_cpu(vht_cap_ie->vht_cap_info);
+ 	vht_cap->cap = cap_info;
+-	vht_cap->cap &= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895 |
+-			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991 |
+-			IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454 |
+-			IEEE80211_VHT_CAP_RXLDPC |
++	vht_cap->cap &= IEEE80211_VHT_CAP_RXLDPC |
+ 			IEEE80211_VHT_CAP_VHT_TXOP_PS |
+ 			IEEE80211_VHT_CAP_HTC_VHT |
+ 			IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK |
+@@ -182,6 +179,9 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru
+ 			IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |
+ 			IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;
+ 
++	vht_cap->cap |= min_t(u32, cap_info & IEEE80211_VHT_CAP_MAX_MPDU_MASK,
++			      own_cap.cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK);
++
+ 	/* and some based on our own capabilities */
+ 	switch (own_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) {
+ 	case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: