Commit 0cad34fb authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


Cross-merge networking fixes after downstream PR (net-6.16-rc6-2).

No conflicts.

Adjacent changes:

drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
  c701574c ("wifi: mt76: mt7925: fix invalid array index in ssid assignment during hw scan")
  b3a431fe ("wifi: mt76: mt7925: fix off by one in mt7925_mcu_hw_scan()")

drivers/net/wireless/mediatek/mt76/mt7996/mac.c
  62da647a ("wifi: mt76: mt7996: Add MLO support to mt7996_tx_check_aggr()")
  dc66a129 ("wifi: mt76: add a wrapper for wcid access with validation")

drivers/net/wireless/mediatek/mt76/mt7996/main.c
  3dd6f67c ("wifi: mt76: Move RCU section in mt7996_mcu_add_rate_ctrl()")
  8989d8e9 ("wifi: mt76: mt7996: Do not set wcid.sta to 1 in mt7996_mac_sta_event()")

net/mac80211/cfg.c
  58fcb1b4 ("wifi: mac80211: reject VHT opmode for unsupported channel widths")
  037dc18a ("wifi: mac80211: add support for storing station S1G capabilities")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a339dd69 c7979c39
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment