From: Felix Fietkau Date: Mon, 13 Feb 2023 10:08:51 +0000 (+0100) Subject: wifi: cfg80211: move A-MSDU check in ieee80211_data_to_8023_exthdr X-Git-Tag: v6.6.17~5509^2~39^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f690e6b4dcd7243e2805a76981b252c2d4bdce6;p=platform%2Fkernel%2Flinux-rpi.git 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 Link: https://lore.kernel.org/r/20230213100855.34315-1-nbd@nbd.name Signed-off-by: Johannes Berg --- diff --git a/net/wireless/util.c b/net/wireless/util.c index 38d3b43..430962f 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -631,8 +631,9 @@ int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr, 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)))) {