blob: b9dc31b2cd7d29353cedd41717d1d5edb2f3e7f2 [file] [log] [blame]
developer20747c12022-09-16 14:09:40 +08001From 96fcb3f5306bceb4f04ca87d097df6f7d391a147 Mon Sep 17 00:00:00 2001
developer68e1eb22022-05-09 17:02:12 +08002From: Peter Chiu <chui-hao.chiu@mediatek.com>
3Date: Thu, 14 Apr 2022 15:18:02 +0800
developer20747c12022-09-16 14:09:40 +08004Subject: [PATCH 4/7] mt76: mt7915: drop undefined action frame
developer68e1eb22022-05-09 17:02:12 +08005
6---
developer4721e252022-06-21 16:41:28 +08007 mt7915/mac.c | 6 ++++++
developer68e1eb22022-05-09 17:02:12 +08008 1 file changed, 6 insertions(+)
9
10diff --git a/mt7915/mac.c b/mt7915/mac.c
developer20747c12022-09-16 14:09:40 +080011index b2322762..967e348c 100644
developer68e1eb22022-05-09 17:02:12 +080012--- a/mt7915/mac.c
13+++ b/mt7915/mac.c
developer5ce5ea42022-08-31 14:12:29 +080014@@ -684,6 +684,8 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
developer68e1eb22022-05-09 17:02:12 +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;
developer5ce5ea42022-08-31 14:12:29 +080023@@ -714,6 +716,10 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
developer68e1eb22022-05-09 17:02:12 +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--
developer20747c12022-09-16 14:09:40 +0800352.25.1
developer68e1eb22022-05-09 17:02:12 +080036