blob: 6d7a03f3956e52dda406a9f69c90afe92540c74e [file] [log] [blame]
developer8928e842023-11-01 08:10:30 +08001From 5fb134dd94aaa8986704094e0b0a62c9f2bfd391 Mon Sep 17 00:00:00 2001
developerc83f1ac2023-10-23 10:30:11 +08002From: Peter Chiu <chui-hao.chiu@mediatek.com>
3Date: Mon, 23 Oct 2023 10:25:13 +0800
developer8928e842023-11-01 08:10:30 +08004Subject: [PATCH 2/6] Revert "wifi: mt76: mt7921: fix the wrong rate selected
5 in fw for the chanctx driver"
developerc83f1ac2023-10-23 10:30:11 +08006
7This reverts commit 9fc37b0ac5467cfe5e3d2ad8a29e9a7646ece2be.
8---
9 mt76_connac_mcu.c | 9 ++-------
10 1 file changed, 2 insertions(+), 7 deletions(-)
11
12diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c
developer8928e842023-11-01 08:10:30 +080013index 07bd57b..1d22ab9 100644
developerc83f1ac2023-10-23 10:30:11 +080014--- a/mt76_connac_mcu.c
15+++ b/mt76_connac_mcu.c
developer8928e842023-11-01 08:10:30 +080016@@ -846,9 +846,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb,
developerc83f1ac2023-10-23 10:30:11 +080017 struct ieee80211_vif *vif,
18 u8 rcpi, u8 sta_state)
19 {
20- struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
21- struct cfg80211_chan_def *chandef = mvif->ctx ?
22- &mvif->ctx->def : &mphy->chandef;
23+ struct cfg80211_chan_def *chandef = &mphy->chandef;
24 enum nl80211_band band = chandef->chan->band;
25 struct mt76_dev *dev = mphy->dev;
26 struct sta_rec_ra_info *ra_info;
developer8928e842023-11-01 08:10:30 +080027@@ -1354,10 +1352,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode);
developerc83f1ac2023-10-23 10:30:11 +080028 const struct ieee80211_sta_he_cap *
29 mt76_connac_get_he_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif)
30 {
31- struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
32- struct cfg80211_chan_def *chandef = mvif->ctx ?
33- &mvif->ctx->def : &phy->chandef;
34- enum nl80211_band band = chandef->chan->band;
35+ enum nl80211_band band = phy->chandef.chan->band;
36 struct ieee80211_supported_band *sband;
37
38 sband = phy->hw->wiphy->bands[band];
39--
402.18.0
41