2023-02-15 18:40:02 +00:00
|
|
|
From: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
Date: Mon, 20 Feb 2023 12:50:50 +0100
|
|
|
|
|
Subject: [PATCH] mac80211: fix mesh forwarding
|
|
|
|
|
|
|
|
|
|
Linearize packets (needed for forwarding A-MSDU subframes).
|
|
|
|
|
Fix network header offset to fix flow dissector (and fair queueing).
|
|
|
|
|
|
|
|
|
|
Fixes: 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces")
|
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
|
|
|
---
|
|
|
|
|
|
|
|
|
|
--- a/net/mac80211/rx.c
|
|
|
|
|
+++ b/net/mac80211/rx.c
|
2023-02-26 12:36:58 +00:00
|
|
|
@@ -2904,6 +2904,9 @@ ieee80211_rx_mesh_data(struct ieee80211_
|
2023-02-15 18:40:02 +00:00
|
|
|
|
|
|
|
|
if (skb_cow_head(fwd_skb, hdrlen - sizeof(struct ethhdr)))
|
|
|
|
|
return RX_DROP_UNUSABLE;
|
|
|
|
|
+
|
|
|
|
|
+ if (skb_linearize(fwd_skb))
|
|
|
|
|
+ return RX_DROP_UNUSABLE;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fwd_hdr = skb_push(fwd_skb, hdrlen - sizeof(struct ethhdr));
|
2023-02-26 12:36:58 +00:00
|
|
|
@@ -2918,7 +2921,7 @@ ieee80211_rx_mesh_data(struct ieee80211_
|
2023-02-15 18:40:02 +00:00
|
|
|
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));
|
