diff options
author | David S. Miller <davem@davemloft.net> | 2021-04-20 16:44:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2021-04-20 16:44:04 -0700 |
commit | 08322284c1620f01f0ece9907b6125be877e247b (patch) | |
tree | 5068b7a970e6d332a83aa5f11e39330d3ddd825b /drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | |
parent | c9ad20573a91ecfce45404bd0e33913b476613c5 (diff) | |
parent | 010bfbe768f7ecc876ffba92db30432de4997e2a (diff) | |
download | linux-stable-08322284c1620f01f0ece9907b6125be877e247b.tar.gz linux-stable-08322284c1620f01f0ece9907b6125be877e247b.tar.bz2 linux-stable-08322284c1620f01f0ece9907b6125be877e247b.zip |
Merge tag 'mac80211-next-for-net-next-2021-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another set of updates, all over the map:
* set sk_pacing_shift for 802.3->802.11 encap offload
* some monitor support for 802.11->802.3 decap offload
* HE (802.11ax) spec updates
* userspace API for TDLS HE support
* along with various other small features, cleanups and
fixups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c')
-rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 443ec0a8bb7d..cc842e3e0027 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -511,7 +511,7 @@ mt76_connac_mcu_sta_he_tlv(struct sk_buff *skb, struct ieee80211_sta *sta) if (elem->mac_cap_info[3] & IEEE80211_HE_MAC_CAP3_OMI_CONTROL) cap |= STA_REC_HE_CAP_OM; - if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU) + if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU) cap |= STA_REC_HE_CAP_AMSDU_IN_AMPDU; if (elem->mac_cap_info[4] & IEEE80211_HE_MAC_CAP4_BQR) |