Skip to content

Commit 899c2c1

Browse files
nbd168jmberg-intel
authored andcommitted
wifi: mac80211: fix flow dissection for forwarded packets
Adjust the network header to point at the correct payload offset Fixes: 986e43b ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces") Signed-off-by: Felix Fietkau <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent 8f0149a commit 899c2c1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/mac80211/rx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2850,7 +2850,7 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *sta
28502850
hdrlen += ETH_ALEN;
28512851
else
28522852
fwd_skb->protocol = htons(fwd_skb->len - hdrlen);
2853-
skb_set_network_header(fwd_skb, hdrlen);
2853+
skb_set_network_header(fwd_skb, hdrlen + 2);
28542854

28552855
info = IEEE80211_SKB_CB(fwd_skb);
28562856
memset(info, 0, sizeof(*info));

0 commit comments

Comments
 (0)