From 9200732e8534f31501128d5320181a2b92368099 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Fri, 8 May 2020 18:26:29 +0200 Subject: [PATCH] mt76: mt7663u: copy key pointer in mt7663u_mac_write_txwi Copy key pointer value before running mt76_tx_status_skb_add() in mt7663u_mac_write_txwi since it will be overwritten setting mt76_tx_cb for probing frames Co-developed-by: Johannes Berg Signed-off-by: Johannes Berg Signed-off-by: Lorenzo Bianconi Signed-off-by: Felix Fietkau --- mt7615/usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mt7615/usb.c b/mt7615/usb.c index f2825b8f..06235f83 100644 --- a/mt7615/usb.c +++ b/mt7615/usb.c @@ -66,6 +66,7 @@ mt7663u_mac_write_txwi(struct mt7615_dev *dev, struct mt76_wcid *wcid, struct sk_buff *skb) { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct ieee80211_key_conf *key = info->control.hw_key; __le32 *txwi; int pid; @@ -76,8 +77,7 @@ mt7663u_mac_write_txwi(struct mt7615_dev *dev, struct mt76_wcid *wcid, txwi = (__le32 *)(skb->data - MT_USB_TXD_SIZE); memset(txwi, 0, MT_USB_TXD_SIZE); - mt7615_mac_write_txwi(dev, txwi, skb, wcid, sta, - pid, info->control.hw_key, false); + mt7615_mac_write_txwi(dev, txwi, skb, wcid, sta, pid, key, false); skb_push(skb, MT_USB_TXD_SIZE); }