From: Felix Fietkau <nbd@xxxxxxxx>
commit 899c2c11810cfe38cb01c847d0df98e181ea5728 upstream.
Adjust the network header to point at the correct payload offset
Fixes: 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces")
Signed-off-by: Felix Fietkau <nbd@xxxxxxxx>
Link: https://lore.kernel.org/r/20230324120924.38412-2-nbd@xxxxxxxx
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/mac80211/rx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -2855,7 +2855,7 @@ ieee80211_rx_mesh_data(struct ieee80211_
hdrlen += ETH_ALEN;
else
fwd_skb->protocol = htons(fwd_skb->len - hdrlen);
- skb_set_network_header(fwd_skb, hdrlen);
+ skb_set_network_header(fwd_skb, hdrlen + 2);
info = IEEE80211_SKB_CB(fwd_skb);
memset(info, 0, sizeof(*info));
Patches currently in stable-queue which might be from nbd@xxxxxxxx are
queue-6.1/wifi-cfg80211-fix-receiving-mesh-packets-without-rfc1042-header.patch
queue-6.1/wifi-mac80211-fix-potential-null-pointer-dereference.patch
queue-6.1/udp-fix-receiving-fraglist-gso-packets.patch
queue-6.1/wifi-mac80211-fix-mesh-path-discovery-based-on-unicast-packets.patch
queue-6.1/wifi-mac80211-fix-mesh-forwarding.patch
queue-6.1/wifi-mac80211-fix-receiving-a-msdu-frames-on-mesh-in.patch
queue-6.1/wifi-mac80211-fix-flow-dissection-for-forwarded-packets.patch
queue-6.1/wifi-mac80211-drop-bogus-static-keywords-in-a-msdu-rx.patch
queue-6.1/wifi-cfg80211-factor-out-bridge-tunnel-rfc1042-heade.patch
queue-6.1/wifi-mac80211-fix-receiving-mesh-packets-in-forwarding-0-networks.patch
queue-6.1/wifi-mac80211-fix-and-simplify-unencrypted-drop-chec.patch
queue-6.1/wifi-mac80211-remove-mesh-forwarding-congestion-chec.patch
queue-6.1/wifi-cfg80211-move-a-msdu-check-in-ieee80211_data_to.patch
queue-6.1/wifi-mac80211-add-a-workaround-for-receiving-non-sta.patch
