From 5fb304b11add72c564aa6f87bd9e182393bd2c99 Mon Sep 17 00:00:00 2001 From: Himanshu Agarwal Date: Tue, 27 Feb 2018 21:14:05 +0530 Subject: [PATCH] qcacld-3.0: Assign center_freq1 and center_freq2 before use As center_freq1 and center_freq2 passed in bss start params by hostapd are not stored in sap_config, center_chan derived in sap_ch_params_to_bonding_channels() is coming 0. And so BSS start failed. Store center_freq1 and center_freq2 in sap_config in __wlan_hdd_cfg80211_start_ap(). Change-Id: I3a5869c2d8488a5bd272762b8dab67b340d72817 CRs-Fixed: 2193663 --- core/hdd/src/wlan_hdd_hostapd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 632fb87722d3..79623073a336 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -8728,7 +8728,6 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, adapter, hdd_device_mode_to_string(adapter->device_mode), adapter->device_mode, cds_is_sub_20_mhz_enabled()); - if (policy_mgr_is_hw_mode_change_in_progress(hdd_ctx->hdd_psoc)) { status = policy_mgr_wait_for_connection_update( hdd_ctx->hdd_psoc); @@ -8741,6 +8740,10 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, channel_width = wlan_hdd_get_channel_bw(params->chandef.width); channel = ieee80211_frequency_to_channel( params->chandef.chan->center_freq); + adapter->session.ap.sap_config.ch_params.center_freq_seg0 = + cds_freq_to_chan(params->chandef.center_freq1); + adapter->session.ap.sap_config.ch_params.center_freq_seg1 = + cds_freq_to_chan(params->chandef.center_freq2); if (cds_is_sub_20_mhz_enabled()) { enum channel_state ch_state; @@ -8875,6 +8878,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, } adapter->session.ap.sap_config.ch_width_orig = params->chandef.width; + status = wlan_hdd_cfg80211_start_bss(adapter, ¶ms->beacon,