| Message ID | 71a5733885991a8211104b616d2f51d120efccb9.1587580510.git.sean.wang@mediatek.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | [v2] mt76: mt7663: fix up BMC entry indicated to unicmd firmware | expand |
> From: Sean Wang <sean.wang@mediatek.com> > > BMC entry for MT7663 unicmd firmware should be a broadcast/multicast entry, > not a unicast entry, that is GTK rekey offload would rely on. > > Fixes: 138860679b2a ("mt76: mt7615: add more uni mcu commands") > Cc: Soul Huang <Soul.Huang@mediatek.com> > Suggested-by: YF Luo <Yf.Luo@mediatek.com> > Co-developed-by: Ryder Lee <ryder.lee@mediatek.com> > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> > Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > Signed-off-by: Sean Wang <sean.wang@mediatek.com> > -- > v1->v2: > mt7615_mcu_uni_add_bss is only called on mt7663 with the offload firmware, > so remove the entire unnecessary if code section. > --- > .../net/wireless/mediatek/mt76/mt7615/mcu.c | 18 +----------------- > 1 file changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c > index 24b78d10d7f7..994446b1baba 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c > @@ -1359,7 +1359,7 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, > .short_st = true, > }, > }; > - u8 idx, tx_wlan_idx = 0; > + u8 idx, tx_wlan_idx = mvif->sta.wcid.idx; nitpick: I guess we do not need tx_wlan_idx anymore. Regards, Lorenzo > int err; > > idx = mvif->omac_idx > EXT_BSSID_START ? HW_BSSID_0 : mvif->omac_idx; > @@ -1369,24 +1369,8 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, > case NL80211_IFTYPE_MESH_POINT: > case NL80211_IFTYPE_AP: > basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_AP); > - tx_wlan_idx = mvif->sta.wcid.idx; > break; > case NL80211_IFTYPE_STATION: > - if (enable) { > - struct ieee80211_sta *sta; > - struct mt7615_sta *msta; > - > - rcu_read_lock(); > - sta = ieee80211_find_sta(vif, vif->bss_conf.bssid); > - if (!sta) { > - rcu_read_unlock(); > - return -EINVAL; > - } > - > - msta = (struct mt7615_sta *)sta->drv_priv; > - tx_wlan_idx = msta->wcid.idx; > - rcu_read_unlock(); > - } > basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_STA); > break; > default: > -- > 2.25.1
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 24b78d10d7f7..994446b1baba 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -1359,7 +1359,7 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, .short_st = true, }, }; - u8 idx, tx_wlan_idx = 0; + u8 idx, tx_wlan_idx = mvif->sta.wcid.idx; int err; idx = mvif->omac_idx > EXT_BSSID_START ? HW_BSSID_0 : mvif->omac_idx; @@ -1369,24 +1369,8 @@ mt7615_mcu_uni_add_bss(struct mt7615_phy *phy, case NL80211_IFTYPE_MESH_POINT: case NL80211_IFTYPE_AP: basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_AP); - tx_wlan_idx = mvif->sta.wcid.idx; break; case NL80211_IFTYPE_STATION: - if (enable) { - struct ieee80211_sta *sta; - struct mt7615_sta *msta; - - rcu_read_lock(); - sta = ieee80211_find_sta(vif, vif->bss_conf.bssid); - if (!sta) { - rcu_read_unlock(); - return -EINVAL; - } - - msta = (struct mt7615_sta *)sta->drv_priv; - tx_wlan_idx = msta->wcid.idx; - rcu_read_unlock(); - } basic_req.basic.conn_type = cpu_to_le32(CONNECTION_INFRA_STA); break; default: