| Message ID | 99b919b29ad60437749d5f30dc8c68ccb3df89f3.1587445885.git.sean.wang@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] mt76: mt7615: Fix up WMM setting for STA mode | expand |
On 2020-04-21 07:20, sean.wang@mediatek.com wrote: > 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> > Signed-off-by: Sean Wang <sean.wang@mediatek.com> > --- > drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c > index 045bde7f554d..e8caa2c7981e 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c > @@ -1339,7 +1339,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; > @@ -1349,10 +1349,9 @@ 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) { > + if (enable && !is_mt7663(&dev->mt76)) { mt7615_mcu_uni_add_bss is only called on mt7663 with offload firmware, so you can simply delete the entire if (enable) { ... } code section. - Felix
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 045bde7f554d..e8caa2c7981e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -1339,7 +1339,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; @@ -1349,10 +1349,9 @@ 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) { + if (enable && !is_mt7663(&dev->mt76)) { struct ieee80211_sta *sta; struct mt7615_sta *msta;