mac80211: Update to version 5.4-rc2

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / subsys / 030-mac80211_fix-scan-when-operating-on-DFS-channels-in-ETSI-domains.patch

diff --git a/package/kernel/mac80211/patches/subsys/030-mac80211_fix-scan-when-operating-on-DFS-channels-in-ETSI-domains.patch b/package/kernel/mac80211/patches/subsys/030-mac80211_fix-scan-when-operating-on-DFS-channels-in-ETSI-domains.patch
index 7bba7176cb6b08ec799dfd6f1899755cdf10c096..560f8850df867b1f40110a5c6ccb783074bbe64c 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/030-mac80211_fix-scan-when-operating-on-DFS-channels-in-ETSI-domains.patch
+++ b/package/kernel/mac80211/patches/subsys/030-mac80211_fix-scan-when-operating-on-DFS-channels-in-ETSI-domains.patch
@@ -25,7 +25,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -5451,6 +5451,14 @@ const struct ieee80211_reg_rule *freq_re
+@@ -5554,6 +5554,14 @@ const struct ieee80211_reg_rule *freq_re
  const char *reg_initiator_name(enum nl80211_reg_initiator initiator);
  
  /**
@@ -91,7 +91,7 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
        if (!ieee80211_can_scan(local, sdata)) {
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
-@@ -3866,6 +3866,7 @@ bool regulatory_pre_cac_allowed(struct w
+@@ -3883,6 +3883,7 @@ bool regulatory_pre_cac_allowed(struct w
  
        return pre_cac_allowed;
  }