developer | 81ca9d6 | 2022-10-14 11:23:22 +0800 | [diff] [blame] | 1 | From 88a457bc6d5909735c89102ef970235c2e8f4038 Mon Sep 17 00:00:00 2001 |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 2 | From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 3 | Date: Thu, 14 Apr 2022 15:18:02 +0800 |
developer | c226de8 | 2022-10-03 12:24:57 +0800 | [diff] [blame] | 4 | Subject: [PATCH 3/3] mt76: mt7915: drop undefined action frame |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 5 | |
| 6 | --- |
developer | 4721e25 | 2022-06-21 16:41:28 +0800 | [diff] [blame] | 7 | mt7915/mac.c | 6 ++++++ |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 8 | 1 file changed, 6 insertions(+) |
| 9 | |
| 10 | diff --git a/mt7915/mac.c b/mt7915/mac.c |
developer | 81ca9d6 | 2022-10-14 11:23:22 +0800 | [diff] [blame] | 11 | index 66aae55d..d1a20818 100644 |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 12 | --- a/mt7915/mac.c |
| 13 | +++ b/mt7915/mac.c |
developer | 81ca9d6 | 2022-10-14 11:23:22 +0800 | [diff] [blame] | 14 | @@ -686,6 +686,8 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 15 | 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; |
developer | 81ca9d6 | 2022-10-14 11:23:22 +0800 | [diff] [blame] | 23 | @@ -716,6 +718,10 @@ int mt7915_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 24 | 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 | -- |
developer | 81ca9d6 | 2022-10-14 11:23:22 +0800 | [diff] [blame] | 35 | 2.25.1 |
developer | 68e1eb2 | 2022-05-09 17:02:12 +0800 | [diff] [blame] | 36 | |