mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
26 lines
950 B
Diff
26 lines
950 B
Diff
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Fri, 2 Dec 2022 13:53:11 +0100
|
||
|
|
Subject: [PATCH] wifi: cfg80211: move A-MSDU check in
|
||
|
|
ieee80211_data_to_8023_exthdr
|
||
|
|
|
||
|
|
When parsing the outer A-MSDU header, don't check for inner bridge tunnel
|
||
|
|
or RFC1042 headers. This is handled by ieee80211_amsdu_to_8023s already.
|
||
|
|
|
||
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/net/wireless/util.c
|
||
|
|
+++ b/net/wireless/util.c
|
||
|
|
@@ -631,8 +631,9 @@ int ieee80211_data_to_8023_exthdr(struct
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (likely(skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0 &&
|
||
|
|
- ((!is_amsdu && ether_addr_equal(payload.hdr, rfc1042_header) &&
|
||
|
|
+ if (likely(!is_amsdu &&
|
||
|
|
+ skb_copy_bits(skb, hdrlen, &payload, sizeof(payload)) == 0 &&
|
||
|
|
+ ((ether_addr_equal(payload.hdr, rfc1042_header) &&
|
||
|
|
payload.proto != htons(ETH_P_AARP) &&
|
||
|
|
payload.proto != htons(ETH_P_IPX)) ||
|
||
|
|
ether_addr_equal(payload.hdr, bridge_tunnel_header)))) {
|