diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-09-30 04:05:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-30 04:05:48 -0700 |
| commit | b68e2275c8027f507a8ac9cf83ec6fca8cbed9ed (patch) | |
| tree | f76d1c945159bc2e10ec0e6ff1fecd2aa676000e | |
| parent | 4ef31e485b008209811351c6c7f14bace95c2482 (diff) | |
| parent | 0a488771cd0633d4f736f3712e05c8e943a38a10 (diff) | |
Merge "qcacld-3.0: Allow BSS start during STA connection" into wlan-cld3.driver.lnx.1.1
| -rw-r--r-- | core/hdd/inc/wlan_hdd_main.h | 3 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_hostapd.c | 12 |
3 files changed, 5 insertions, 12 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 9f9ccdf57c7e..a06acc6047f9 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2381,8 +2381,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, struct cfg80211_beacon_data *params, const u8 *ssid, size_t ssid_len, enum nl80211_hidden_ssid hidden_ssid, - bool check_for_concurrency, - bool update_beacon); + bool check_for_concurrency); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void); #else diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 73ec969cdb47..81cd8d938dd7 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -8559,7 +8559,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel) status = wlan_hdd_cfg80211_start_bss(pre_cac_adapter, NULL, PRE_CAC_SSID, qdf_str_len(PRE_CAC_SSID), - NL80211_HIDDEN_SSID_NOT_IN_USE, false, false); + NL80211_HIDDEN_SSID_NOT_IN_USE, false); if (QDF_IS_STATUS_ERROR(status)) { hdd_err("start bss failed"); goto stop_close_pre_cac_adapter; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 0bd1376cde3c..8c1fa6bbaa1b 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -7685,8 +7685,7 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, struct cfg80211_beacon_data *params, const u8 *ssid, size_t ssid_len, enum nl80211_hidden_ssid hidden_ssid, - bool check_for_concurrency, - bool update_beacon) + bool check_for_concurrency) { tsap_Config_t *pConfig; beacon_data_t *pBeacon = NULL; @@ -7714,11 +7713,6 @@ int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, ENTER(); - if (!update_beacon && cds_is_connection_in_progress(NULL, NULL)) { - hdd_err("Can't start BSS: connection is in progress"); - return -EINVAL; - } - disable_fw_tdls_state = true; wlan_hdd_check_conc_and_update_tdls_state(pHddCtx, disable_fw_tdls_state); @@ -8870,7 +8864,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, wlan_hdd_cfg80211_start_bss(pAdapter, ¶ms->beacon, params->ssid, params->ssid_len, - params->hidden_ssid, true, false); + params->hidden_ssid, true); if (status != 0) { hdd_err("Error Start bss Failed"); @@ -8997,7 +8991,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy, pAdapter->sessionCtx.ap.beacon = new; hdd_debug("update beacon for P2P GO/SAP"); status = wlan_hdd_cfg80211_start_bss(pAdapter, params, NULL, - 0, 0, false, true); + 0, 0, false); EXIT(); return status; |