From 84e1e23f32fbcb1c87fb7293fae2fd52960b7613 Mon Sep 17 00:00:00 2001 From: Tushnim Bhattacharyya Date: Wed, 27 Jun 2018 17:57:24 -0700 Subject: [PATCH] qcacld-3.0: Don't update the global channel list on channel avoidance Don't update the global channel list on channel avoidance event. The LTE channel avoidance is relevant for beaconing entities only. Change-Id: Iad991e63d59d7070d487c2aef5302ced1d0f91c6 CRs-Fixed: 2267371 --- core/hdd/src/wlan_hdd_regulatory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 2de87e3cbf94..b8fb6b6e6186 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -1309,12 +1309,13 @@ static void hdd_regulatory_dyn_cbk(struct wlan_objmgr_psoc *psoc, if (wiphy->registered) hdd_send_wiphy_regd_sync_event(hdd_ctx); #endif - sme_generic_change_country_code(hdd_ctx->mac_handle, - hdd_ctx->reg.alpha2); if (avoid_freq_ind) hdd_ch_avoid_ind(hdd_ctx, &avoid_freq_ind->chan_list, &avoid_freq_ind->freq_list); + else + sme_generic_change_country_code(hdd_ctx->mac_handle, + hdd_ctx->reg.alpha2); } int hdd_regulatory_init(struct hdd_context *hdd_ctx, struct wiphy *wiphy)