| developer | b0c8678 | 2023-10-27 15:40:47 +0800 | [diff] [blame^] | 1 | From 5959391d31be290f08b6614c178231a298b4b91e Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 3 | Date: Mon, 23 Oct 2023 10:25:13 +0800 |
| 4 | Subject: [PATCH 2012/2015] Revert "wifi: mt76: mt7921: fix the wrong rate |
| 5 | selected in fw for the chanctx driver" |
| 6 | |
| 7 | This reverts commit 9fc37b0ac5467cfe5e3d2ad8a29e9a7646ece2be. |
| 8 | --- |
| 9 | mt76_connac_mcu.c | 9 ++------- |
| 10 | 1 file changed, 2 insertions(+), 7 deletions(-) |
| 11 | |
| 12 | diff --git a/mt76_connac_mcu.c b/mt76_connac_mcu.c |
| 13 | index aa99bd78..3a6404a7 100644 |
| 14 | --- a/mt76_connac_mcu.c |
| 15 | +++ b/mt76_connac_mcu.c |
| 16 | @@ -837,9 +837,7 @@ void mt76_connac_mcu_sta_tlv(struct mt76_phy *mphy, struct sk_buff *skb, |
| 17 | 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; |
| 27 | @@ -1345,10 +1343,7 @@ EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode); |
| 28 | 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 | -- |
| 40 | 2.18.0 |
| 41 | |