mt76: fix software encryption issues

Software encrypted packets can be passed not just through the drv_tx callback,
but also through the intermediate tx queue.
In order to deal with that, move the override to mt76x02_mac_write_txwi and
also take care of filling in the per-packet rate information

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 2dc80ea267522a0318b2246b027960a3087c037a..6bd7f87644a4cc624ac1305687dabf4cb4f42b34 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -291,6 +291,13 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi,
 
        memset(txwi, 0, sizeof(*txwi));
 
+       if (!info->control.hw_key && wcid && wcid->hw_key_idx != 0xff &&
+           ieee80211_has_protected(hdr->frame_control)) {
+               wcid = NULL;
+               ieee80211_get_tx_rates(info->control.vif, sta, skb,
+                                      info->control.rates, 1);
+       }
+
        if (wcid)
                txwi->wcid = wcid->idx;
        else

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
index 7861a832940b6382662868369b5c091d0c2b49e7..94f47248c59f252e9a4228c39e7161d488a70556 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
@@ -22,7 +22,6 @@
 void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
                struct sk_buff *skb)
 {
-       struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct mt76x02_dev *dev = hw->priv;
        struct ieee80211_vif *vif = info->control.vif;
@@ -33,13 +32,7 @@ void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 
                msta = (struct mt76x02_sta *)control->sta->drv_priv;
                wcid = &msta->wcid;
-               /* sw encrypted frames */
-               if (!info->control.hw_key && wcid->hw_key_idx != 0xff &&
-                   ieee80211_has_protected(hdr->frame_control))
-                       control->sta = NULL;
-       }
-
-       if (vif && !control->sta) {
+       } else if (vif) {
                struct mt76x02_vif *mvif;
 
                mvif = (struct mt76x02_vif *)vif->drv_priv;