소스 검색

qcacld-3.0: Optimize conditions to send CSA or ECSA

Today projects should all support all band channel switch.
SAP option to send CSA or ECSA should not depend on whether operating
on channel 2.4 GHz, but considering if client support Extended Channel
Switch and whether 6 GHz channel involved as currently do.

Enable CONFIG_CHANNEL_HOPPING_ALL_BANDS in default configure and
remove checking 2.4 GHz channel condition.

Change-Id: Ibd73ca2115f8f2183292f3ca82d29be4590951a1
CRs-Fixed: 3642763
Will Huang 1 년 전
부모
커밋
79c20761dc
3개의 변경된 파일1개의 추가작업 그리고 3개의 파일을 삭제
  1. 0 2
      configs/default_defconfig
  2. 1 0
      core/mac/src/pe/lim/lim_process_sme_req_messages.c
  3. 0 1
      core/mac/src/pe/sch/sch_beacon_gen.c

+ 0 - 2
configs/default_defconfig

@@ -1446,9 +1446,7 @@ ifeq ($(CONFIG_ARCH_MDM9607), y)
 CONFIG_TUFELLO_DUAL_FW_SUPPORT := y
 endif
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
 CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
-endif
 
 ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE) $(CONFIG_ARCH_SA515)))
 	ifneq ($(CONFIG_SLUB_DEBUG), y)

+ 1 - 0
core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -10040,6 +10040,7 @@ skip_vht:
 
 	/* Send ECSA/CSA Action frame after updating the beacon */
 	if (CHAN_HOP_ALL_BANDS_ENABLE &&
+	    session_entry->lim_non_ecsa_cap_num &&
 	    !WLAN_REG_IS_6GHZ_CHAN_FREQ(target_ch_freq))
 		lim_send_chan_switch_action_frame
 			(mac_ctx,

+ 0 - 1
core/mac/src/pe/sch/sch_beacon_gen.c

@@ -701,7 +701,6 @@ sch_set_fixed_beacon_fields(struct mac_context *mac_ctx, struct pe_session *sess
 		}
 
 		if (session->lim_non_ecsa_cap_num &&
-		    WLAN_REG_IS_24GHZ_CH_FREQ(session->curr_op_freq) &&
 		    !is_6ghz_chsw)
 			populate_channel_switch_ann(mac_ctx, bcn_2, session);
 	}