Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 128b75bf authored by Felix Fietkau's avatar Felix Fietkau
Browse files

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: default avatarFelix Fietkau <nbd@nbd.name>
parent e6287c33

drivers/net/wireless/mediatek/mt76/mt76x02_mac.c

+7 −0
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c

+1 −8
Original line number Diff line number Diff line
@@ -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;