blob: c6af0f3a2864191897f1e05159072e13b7f5402f [file] [log] [blame]
developeraace7f52022-06-24 13:40:42 +08001From d5aa55dd78e4b047bbf462a65ac47b30409ad8f0 Mon Sep 17 00:00:00 2001
developerf32dabf2022-06-01 10:59:24 +08002From: Peter Chiu <chui-hao.chiu@mediatek.com>
3Date: Thu, 14 Apr 2022 15:18:02 +0800
developeraace7f52022-06-24 13:40:42 +08004Subject: [PATCH 05/12] mt76: mt7915: drop undefined action frame
developerf32dabf2022-06-01 10:59:24 +08005
6---
7 mt7915/mac.c | 6 ++++++
8 1 file changed, 6 insertions(+)
9
10diff --git a/mt7915/mac.c b/mt7915/mac.c
developeraace7f52022-06-24 13:40:42 +080011index 9092b40..6a4da8e 100644
developerf32dabf2022-06-01 10:59:24 +080012--- a/mt7915/mac.c
13+++ b/mt7915/mac.c
developeraace7f52022-06-24 13:40:42 +080014@@ -683,6 +683,8 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
developerf32dabf2022-06-01 10:59:24 +080015 struct mt76_tx_info *tx_info)
16 {
17 struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx_info->skb->data;
18+ struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)tx_info->skb->data;
19+ __le16 fc = hdr->frame_control;
20 struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);
21 struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb);
22 struct ieee80211_key_conf *key = info->control.hw_key;
developeraace7f52022-06-24 13:40:42 +080023@@ -713,6 +715,10 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
developerf32dabf2022-06-01 10:59:24 +080024 t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size);
25 t->skb = tx_info->skb;
26
27+ if (ieee80211_is_action(fc) &&
28+ mgmt->u.action.category == 0xff)
29+ return -1;
30+
31 id = mt76_token_consume(mdev, &t);
32 if (id < 0)
33 return id;
34--
352.18.0
36