瀏覽代碼

qcacmn: Modify max_bw for 240 MHz channels after copying to psoc

A kernel warning is observed when the reg_rules are sent to the cfg80211
module on a 320mhz supported radio.

On a 320mhz supported radio, for the 5 GHz reg_rule of the 5490-5730 band,
the max_bw initially comes from the target as 240 MHz. Since
reg_modify_max_bw_for_240mhz_5g_chans is called before copying
the reg_rules to psoc, the max_bw is set to 320 MHz. There is a warning
condition the cfg80211 module to check if the max bandwidth is greater
start and end frequency difference. This check causes the warning.

To fix this issue, call reg_modify_max_bw_for_240mhz_5g_chans after
copying the reg_rules to the psoc.

Change-Id: I385971a2f6c849f7cdd17903ff33646f0fa9d47e
CRs-Fixed: 3236069
Hariharan Basuthkar 3 年之前
父節點
當前提交
261715db9e
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      umac/regulatory/core/src/reg_build_chan_list.c

+ 2 - 2
umac/regulatory/core/src/reg_build_chan_list.c

@@ -3368,12 +3368,12 @@ reg_fill_master_channels(struct cur_regulatory_info *regulat_info,
 				     sizeof(struct cur_reg_rule));
 		curr_reg_rule_location = num_2g_reg_rules;
 		if (num_5g_reg_rules) {
-			reg_modify_max_bw_for_240mhz_5g_chans(regulat_info,
-							      reg_rule_5g);
 			qdf_mem_copy(reg_rules->reg_rules +
 				     curr_reg_rule_location, reg_rule_5g,
 				     num_5g_reg_rules *
 				     sizeof(struct cur_reg_rule));
+			reg_modify_max_bw_for_240mhz_5g_chans(regulat_info,
+							      reg_rule_5g);
 		}
 	}