mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From: Felix Fietkau <nbd@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@nbd.name>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/net/mac80211/vht.c
|
||
|
|
+++ b/net/mac80211/vht.c
|
||
|
|
@@ -168,10 +168,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 |
|
||
|
|
@@ -180,6 +177,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:
|