From 2bfab5b7ff7a3b158366d9abaff13ac73b9568c4 Mon Sep 17 00:00:00 2001 From: Min Liu Date: Fri, 13 Apr 2018 15:30:22 +0800 Subject: [PATCH] qcacld-3.0: Ignore regulatory notifier from CORE Since WLAN host driver is regulatory offload design, regulatory notifier from CORE should always be ignored. Change-Id: Iaf23bdd1606e84cb309101246088ce6d506aa78b CRs-Fixed: 2215884 --- core/hdd/src/wlan_hdd_regulatory.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c index 588264cf5c91..0adf2fcfb41c 100644 --- a/core/hdd/src/wlan_hdd_regulatory.c +++ b/core/hdd/src/wlan_hdd_regulatory.c @@ -794,16 +794,11 @@ void hdd_reg_notifier(struct wiphy *wiphy, request->dfs_region); switch (request->initiator) { - case NL80211_REGDOM_SET_BY_CORE: - if (pld_get_driver_load_cnt(hdd_ctx->parent_dev) == 0) { - hdd_debug("ignore the 1st time notifier from CORE"); - return; - } - /* fall through to set country */ case NL80211_REGDOM_SET_BY_USER: status = ucfg_reg_set_country(hdd_ctx->hdd_pdev, request->alpha2); break; + case NL80211_REGDOM_SET_BY_CORE: case NL80211_REGDOM_SET_BY_COUNTRY_IE: case NL80211_REGDOM_SET_BY_DRIVER: default: