diff options
| author | Kalle Valo <kvalo@kernel.org> | 2022-03-17 16:29:50 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-03-17 16:29:50 +0200 |
| commit | a93ccb5c386c00727eb67b0793fbbae6403b69a1 (patch) | |
| tree | 493056a14621810a48f7e440ccb2b2277db5e90e /drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | |
| parent | de7ba639e6c5a9903062d2f029423d89cea91398 (diff) | |
| parent | 24e69f6bc3ca4a1696158b68a6fbf14252a8bd28 (diff) | |
Merge tag 'mt76-for-kvalo-2022-03-16' of https://github.com/nbd168/wireless
mt76 patches for 5.18
- bugfixes
- mbssid support for mt7915
- 6 GHz support for mt7915
- mt7921u driver
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7615/mcu.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index e98c6076a633..97e2a85cb728 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -880,7 +880,7 @@ mt7615_mcu_wtbl_sta_add(struct mt7615_phy *phy, struct ieee80211_vif *vif, NULL, wtbl_hdr); if (sta) mt76_connac_mcu_wtbl_ht_tlv(&dev->mt76, wskb, sta, - NULL, wtbl_hdr, true); + NULL, wtbl_hdr, true, true); mt76_connac_mcu_wtbl_hdr_trans_tlv(wskb, vif, &msta->wcid, NULL, wtbl_hdr); } @@ -2151,7 +2151,8 @@ int mt7615_mcu_set_chan_info(struct mt7615_phy *phy, int cmd) .center_chan2 = ieee80211_frequency_to_channel(freq2), }; - if (cmd == MCU_EXT_CMD(SET_RX_PATH)) + if (cmd == MCU_EXT_CMD(SET_RX_PATH) || + dev->mt76.hw->conf.flags & IEEE80211_CONF_MONITOR) req.switch_reason = CH_SWITCH_NORMAL; else if (phy->mt76->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) req.switch_reason = CH_SWITCH_SCAN_BYPASS_DPD; |