mac80211: update to v6.1.24

[openwrt/staging/dedeckeh.git] / package / kernel / mac80211 / patches / subsys / 320-wifi-mac80211-use-mesh-header-cache-to-speed-up-mesh.patch

diff --git a/package/kernel/mac80211/patches/subsys/320-wifi-mac80211-use-mesh-header-cache-to-speed-up-mesh.patch b/package/kernel/mac80211/patches/subsys/320-wifi-mac80211-use-mesh-header-cache-to-speed-up-mesh.patch
index 3b0bae67a5f176307ec0dd2851115d102ab5d097..28b1ff110684eeaa2f2a203b4bc8120ca7d64dca 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/320-wifi-mac80211-use-mesh-header-cache-to-speed-up-mesh.patch
+++ b/package/kernel/mac80211/patches/subsys/320-wifi-mac80211-use-mesh-header-cache-to-speed-up-mesh.patch
@@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +
 +      skb->dev = sdata->dev;
 +      memcpy(&eth, skb->data, ETH_HLEN - 2);
-+      skb_pull(skb, sizeof(eth));
++      skb_pull(skb, 2);
 +      __ieee80211_xmit_fast(sdata, sta, &entry->fast_tx, skb, tid_tx,
 +                            eth.h_dest, eth.h_source);
 +      IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, fwded_unicast);
@@ -106,7 +106,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  rx_accept:
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
-@@ -2018,6 +2018,8 @@ void __ieee80211_xmit_fast(struct ieee80
+@@ -2022,6 +2022,8 @@ void __ieee80211_xmit_fast(struct ieee80
                           struct ieee80211_fast_tx *fast_tx,
                           struct sk_buff *skb, bool ampdu,
                           const u8 *da, const u8 *sa);