mac80211: sync nl80211.h with upstream and backport a WPA3 related commit

[openwrt/staging/ynezz.git] / package / kernel / mac80211 / patches / subsys / 382-mac80211-properly-handle-A-MSDUs-that-start-with-an-.patch

diff --git a/package/kernel/mac80211/patches/subsys/382-mac80211-properly-handle-A-MSDUs-that-start-with-an-.patch b/package/kernel/mac80211/patches/subsys/382-mac80211-properly-handle-A-MSDUs-that-start-with-an-.patch
index 3fdabde21934b59f50cac55bbd2715a0ffed00e5..d59fa0509122133dfc51d8db36eb9ac837beafd6 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/382-mac80211-properly-handle-A-MSDUs-that-start-with-an-.patch
+++ b/package/kernel/mac80211/patches/subsys/382-mac80211-properly-handle-A-MSDUs-that-start-with-an-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -5628,7 +5628,7 @@ unsigned int ieee80211_get_mesh_hdrlen(s
+@@ -5637,7 +5637,7 @@ unsigned int ieee80211_get_mesh_hdrlen(s
   */
  int ieee80211_data_to_8023_exthdr(struct sk_buff *skb, struct ethhdr *ehdr,
                                  const u8 *addr, enum nl80211_iftype iftype,
@@ -24,7 +24,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  
  /**
   * ieee80211_data_to_8023 - convert an 802.11 data frame to 802.3
-@@ -5640,7 +5640,7 @@ int ieee80211_data_to_8023_exthdr(struct
+@@ -5649,7 +5649,7 @@ int ieee80211_data_to_8023_exthdr(struct
  static inline int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
                                         enum nl80211_iftype iftype)
  {