blob: 6eff0ae8e256c8409c16e8a5bd495deeccc214ea [file] [log] [blame]
developer2458e702022-12-13 15:52:04 +08001From 8c5a000a492457202b6fe8518f42a2515238b528 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
developer2458e702022-12-13 15:52:04 +08004Subject: [PATCH 1008/1009] 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
developer2458e702022-12-13 15:52:04 +080011index 229e68c3..fc7b7903 100644
developerf32dabf2022-06-01 10:59:24 +080012--- a/mt7915/mac.c
13+++ b/mt7915/mac.c
developer2458e702022-12-13 15:52:04 +080014@@ -761,6 +761,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;
developer2458e702022-12-13 15:52:04 +080023@@ -791,6 +793,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--
developer2458e702022-12-13 15:52:04 +0800352.25.1
developerf32dabf2022-06-01 10:59:24 +080036