mac80211: ath11k: sync with ath-next

[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / ath11k / 905-ath11k-remove-intersection-support-for-regulatory-ru.patch

diff --git a/package/kernel/mac80211/patches/ath11k/905-ath11k-remove-intersection-support-for-regulatory-ru.patch b/package/kernel/mac80211/patches/ath11k/905-ath11k-remove-intersection-support-for-regulatory-ru.patch
index 5b02bcba66076969b4086f5776628a63e8c1c343..74317e0262a44dcbbf7f1b18b09be18f20969431 100644 (file)
--- a/package/kernel/mac80211/patches/ath11k/905-ath11k-remove-intersection-support-for-regulatory-ru.patch
+++ b/package/kernel/mac80211/patches/ath11k/905-ath11k-remove-intersection-support-for-regulatory-ru.patch
@@ -23,7 +23,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
 
 --- a/drivers/net/wireless/ath/ath11k/reg.c
 +++ b/drivers/net/wireless/ath/ath11k/reg.c
-@@ -352,129 +352,6 @@ static u32 ath11k_map_fw_reg_flags(u16 r
+@@ -362,129 +362,6 @@ static u32 ath11k_map_fw_phy_flags(u32 p
        return flags;
  }
  
@@ -153,7 +153,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
  static const char *
  ath11k_reg_get_regdom_str(enum nl80211_dfs_regions dfs_region)
  {
-@@ -609,9 +486,9 @@ ath11k_reg_update_weather_radar_band(str
+@@ -619,9 +496,9 @@ ath11k_reg_update_weather_radar_band(str
  
  struct ieee80211_regdomain *
  ath11k_reg_build_regd(struct ath11k_base *ab,
@@ -165,7 +165,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
        struct cur_reg_rule *reg_rule;
        u8 i = 0, j = 0, k = 0;
        u8 num_rules;
-@@ -628,26 +505,26 @@ ath11k_reg_build_regd(struct ath11k_base
+@@ -638,26 +515,26 @@ ath11k_reg_build_regd(struct ath11k_base
                num_rules += reg_info->num_6ghz_rules_ap[WMI_REG_INDOOR_AP];
  
        if (!num_rules)
@@ -199,16 +199,16 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
                   reg_info->dfs_region, num_rules);
        /* Update reg_rules[] below. Firmware is expected to
         * send these rules in order(2 GHz rules first and then 5 GHz)
-@@ -686,7 +563,7 @@ ath11k_reg_build_regd(struct ath11k_base
- 
+@@ -697,7 +574,7 @@ ath11k_reg_build_regd(struct ath11k_base
                flags |= ath11k_map_fw_reg_flags(reg_rule->flags);
+               flags |= ath11k_map_fw_phy_flags(reg_info->phybitmap);
  
 -              ath11k_reg_update_rule(tmp_regd->reg_rules + i,
 +              ath11k_reg_update_rule(new_regd->reg_rules + i,
                                       reg_rule->start_freq,
                                       reg_rule->end_freq, max_bw,
                                       reg_rule->ant_gain, reg_rule->reg_power,
-@@ -701,7 +578,7 @@ ath11k_reg_build_regd(struct ath11k_base
+@@ -712,7 +589,7 @@ ath11k_reg_build_regd(struct ath11k_base
                    reg_info->dfs_region == ATH11K_DFS_REG_ETSI &&
                    (reg_rule->end_freq > ETSI_WEATHER_RADAR_BAND_LOW &&
                    reg_rule->start_freq < ETSI_WEATHER_RADAR_BAND_HIGH)){
@@ -217,7 +217,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
                                                             reg_rule, &i,
                                                             flags, max_bw);
                        continue;
-@@ -712,37 +589,20 @@ ath11k_reg_build_regd(struct ath11k_base
+@@ -723,37 +600,20 @@ ath11k_reg_build_regd(struct ath11k_base
                                   "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d) (%d, %d)\n",
                                   i + 1, reg_rule->start_freq, reg_rule->end_freq,
                                   max_bw, reg_rule->ant_gain, reg_rule->reg_power,
@@ -260,7 +260,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
  
 --- a/drivers/net/wireless/ath/ath11k/reg.h
 +++ b/drivers/net/wireless/ath/ath11k/reg.h
-@@ -30,7 +30,7 @@ void ath11k_reg_free(struct ath11k_base
+@@ -33,7 +33,7 @@ void ath11k_reg_free(struct ath11k_base
  void ath11k_regd_update_work(struct work_struct *work);
  struct ieee80211_regdomain *
  ath11k_reg_build_regd(struct ath11k_base *ab,
@@ -271,7 +271,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
  #endif
 --- a/drivers/net/wireless/ath/ath11k/wmi.c
 +++ b/drivers/net/wireless/ath/ath11k/wmi.c
-@@ -7059,24 +7059,12 @@ static void ath11k_wmi_htc_tx_complete(s
+@@ -7060,24 +7060,12 @@ static void ath11k_wmi_htc_tx_complete(s
                wake_up(&wmi->tx_ce_desc_wq);
  }
  
@@ -296,7 +296,7 @@ Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
        int ret = 0, pdev_idx, i, j;
        struct ath11k *ar;
  
-@@ -7140,17 +7128,7 @@ static int ath11k_reg_chan_list_event(st
+@@ -7141,17 +7129,7 @@ static int ath11k_reg_chan_list_event(st
                    (char *)reg_info->alpha2, 2))
                goto mem_free;