diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-03-24 13:09:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-29 17:30:55 +0200 |
| commit | b2b068cb05b6a915b19d172332b5b65cd29bcc27 (patch) | |
| tree | 461de1d8514ead9273ec96c8ff3f4dd575b85268 /net | |
| parent | 84de40083d7a900e49d3d6ced64ba6a37bd4226b (diff) | |
| download | linux-b2b068cb05b6a915b19d172332b5b65cd29bcc27.tar.gz linux-b2b068cb05b6a915b19d172332b5b65cd29bcc27.tar.bz2 linux-b2b068cb05b6a915b19d172332b5b65cd29bcc27.zip | |
wifi: mac80211: fix flow dissection for forwarded packets
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@nbd.name>
Link: https://lore.kernel.org/r/20230324120924.38412-2-nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 3a5132dae19f..50964e73dae8 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2855,7 +2855,7 @@ ieee80211_rx_mesh_data(struct ieee80211_sub_if_data *sdata, struct sta_info *sta 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)); |