summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2017-09-06 17:26:43 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-06 17:26:43 -0700
commitcc698cb97486e9e893ec023a7a591b92e51c2802 (patch)
treea14730e29361b90e8a7b7a88bae331c9d177301d
parent7dee4df9ad0bc0907feffd12abc50fbc1b6d2246 (diff)
parent21b1fa2bc33be3806f49a257c710089bc2649099 (diff)
Merge "qcacld-3.0: Init hdd channel info only after mac context is available" into wlan-cld3.driver.lnx.1.1
-rw-r--r--core/hdd/src/wlan_hdd_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 3f7e42124e37..0eea63413beb 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -7834,7 +7834,6 @@ static hdd_context_t *hdd_context_create(struct device *dev)
cds_set_multicast_logging(hdd_ctx->config->multicast_host_fw_msgs);
- wlan_hdd_init_chan_info(hdd_ctx);
ret = wlan_hdd_init_tx_rx_histogram(hdd_ctx);
if (ret)
goto err_deinit_hdd_context;
@@ -9781,6 +9780,8 @@ int hdd_wlan_startup(struct device *dev)
goto err_stop_modules;
}
+ wlan_hdd_init_chan_info(hdd_ctx);
+
ret = hdd_wiphy_init(hdd_ctx);
if (ret) {
hdd_err("Failed to initialize wiphy: %d", ret);