package/kernel/mac80211/patches/subsys/321-mac80211-fix-mesh-forwarding.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Mon, 20 Feb 2023 12:50:50 +0100
   3 Subject: [PATCH] mac80211: fix mesh forwarding
   4
   5 Linearize packets (needed for forwarding A-MSDU subframes).
   6 Fix network header offset to fix flow dissector (and fair queueing).
   7
   8 Fixes: 986e43b19ae9 ("wifi: mac80211: fix receiving A-MSDU frames on mesh interfaces")
   9 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  10 ---
  11
  12 --- a/net/mac80211/rx.c
  13 +++ b/net/mac80211/rx.c
  14 @@ -2847,6 +2847,9 @@ ieee80211_rx_mesh_data(struct ieee80211_
  15
  16                 if (skb_cow_head(fwd_skb, hdrlen - sizeof(struct ethhdr)))
  17                         return RX_DROP_UNUSABLE;
  18 +
  19 +               if (skb_linearize(fwd_skb))
  20 +                       return RX_DROP_UNUSABLE;
  21         }
  22
  23         fwd_hdr = skb_push(fwd_skb, hdrlen - sizeof(struct ethhdr));
  24 @@ -2861,7 +2864,7 @@ ieee80211_rx_mesh_data(struct ieee80211_
  25                 hdrlen += ETH_ALEN;
  26         else
  27                 fwd_skb->protocol = htons(fwd_skb->len - hdrlen);
  28 -       skb_set_network_header(fwd_skb, hdrlen);
  29 +       skb_set_network_header(fwd_skb, hdrlen + 2);
  30
  31         info = IEEE80211_SKB_CB(fwd_skb);
  32         memset(info, 0, sizeof(*info));