diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 816c242f5614..33588a241e0a 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -823,6 +823,7 @@ struct hdd_station_info { * @wep_key: WEP key array * @wep_def_key_idx: WEP default key index * @sap_context: Pointer to context maintained by SAP (opaque to HDD) + * @sap_config: SAP configuration */ struct hdd_ap_ctx { struct hdd_hostapd_state hostapd_state; @@ -834,11 +835,10 @@ struct hdd_ap_ctx { tCsrRoamSetKey wep_key[CSR_MAX_NUM_KEY]; uint8_t wep_def_key_idx; struct sap_context *sap_context; + tsap_Config_t sap_config; tSirWPSPBCProbeReq WPSPBCProbeReq; - tsap_Config_t sapConfig; - struct semaphore semWpsPBCOverlapInd; qdf_mc_timer_t hdd_ap_inactivity_timer; diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index ff351db05a09..0fc42695987e 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -1544,8 +1544,8 @@ int wlan_hdd_sap_cfg_dfs_override(struct hdd_adapter *adapter) if (!con_sap_adapter) return 0; - sap_config = &adapter->sessionCtx.ap.sapConfig; - con_sap_config = &con_sap_adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; + con_sap_config = &con_sap_adapter->sessionCtx.ap.sap_config; con_ch = con_sap_adapter->sessionCtx.ap.operatingChannel; if (!wlan_reg_is_dfs_ch(hdd_ctx->hdd_pdev, con_ch)) @@ -1817,7 +1817,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter) return -EINVAL; } hdd_ctx = WLAN_HDD_GET_CTX(adapter); - sap_config = &adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; if (hdd_ctx->acs_policy.acs_channel) sap_config->channel = hdd_ctx->acs_policy.acs_channel; else @@ -1972,7 +1972,7 @@ static int hdd_update_reg_chan_info(struct hdd_adapter *adapter, struct ch_params ch_params = {0}; uint8_t bw_offset = 0, chan = 0; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - tsap_Config_t *sap_config = &adapter->sessionCtx.ap.sapConfig; + tsap_Config_t *sap_config = &adapter->sessionCtx.ap.sap_config; /* memory allocation */ sap_config->channel_info = qdf_mem_malloc( @@ -2242,7 +2242,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter, } ENTER(); - sap_config = &adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; /* When first 2 connections are on the same frequency band, * then PCL would include only channels from the other * frequency band on which no connections are active @@ -2270,7 +2270,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter, } } - hdd_get_scan_band(hdd_ctx, &adapter->sessionCtx.ap.sapConfig, &band); + hdd_get_scan_band(hdd_ctx, &adapter->sessionCtx.ap.sap_config, &band); if (sap_config->acs_cfg.ch_list) { /* Copy INI or hostapd provided ACS channel range*/ @@ -2288,7 +2288,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter, hdd_update_reg_chan_info(adapter, channel_count, channel_list); hdd_get_freq_list(channel_list, freq_list, channel_count); /* Get phymode */ - phy_mode = adapter->sessionCtx.ap.sapConfig.acs_cfg.hw_mode; + phy_mode = adapter->sessionCtx.ap.sap_config.acs_cfg.hw_mode; skb = cfg80211_vendor_event_alloc(hdd_ctx->wiphy, &(adapter->wdev), @@ -2525,7 +2525,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy, goto out; } - sap_config = &adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; qdf_mem_zero(&sap_config->acs_cfg, sizeof(struct sap_acs_cfg)); status = hdd_nla_parse(tb, QCA_WLAN_VENDOR_ATTR_ACS_MAX, data, data_len, @@ -2793,9 +2793,9 @@ void wlan_hdd_undo_acs(struct hdd_adapter *adapter) { if (adapter == NULL) return; - if (adapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list) { - qdf_mem_free(adapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list); - adapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list = NULL; + if (adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list) { + qdf_mem_free(adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list); + adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list = NULL; } } @@ -2834,7 +2834,7 @@ static void wlan_hdd_cfg80211_start_pending_acs(struct work_struct *work) void wlan_hdd_cfg80211_acs_ch_select_evt(struct hdd_adapter *adapter) { struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); - tsap_Config_t *sap_cfg = &(WLAN_HDD_GET_AP_CTX_PTR(adapter))->sapConfig; + tsap_Config_t *sap_cfg = &(WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config; struct sk_buff *vendor_event; int ret_val; struct hdd_adapter *con_sap_adapter; @@ -9268,7 +9268,7 @@ int wlan_hdd_sap_get_valid_channellist(struct hdd_adapter *adapter, uint8_t i; QDF_STATUS status; - sap_config = &adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; status = policy_mgr_get_valid_chans(hdd_ctx->hdd_psoc, @@ -9524,22 +9524,22 @@ int wlan_hdd_request_pre_cac(uint8_t channel) qdf_mem_copy(pre_cac_adapter->sessionCtx.ap.beacon, ap_adapter->sessionCtx.ap.beacon, sizeof(*pre_cac_adapter->sessionCtx.ap.beacon)); - pre_cac_adapter->sessionCtx.ap.sapConfig.ch_width_orig = - ap_adapter->sessionCtx.ap.sapConfig.ch_width_orig; - pre_cac_adapter->sessionCtx.ap.sapConfig.authType = - ap_adapter->sessionCtx.ap.sapConfig.authType; + pre_cac_adapter->sessionCtx.ap.sap_config.ch_width_orig = + ap_adapter->sessionCtx.ap.sap_config.ch_width_orig; + pre_cac_adapter->sessionCtx.ap.sap_config.authType = + ap_adapter->sessionCtx.ap.sap_config.authType; /* Premise is that on moving from 2.4GHz to 5GHz, the SAP will continue * to operate on the same bandwidth as that of the 2.4GHz operations. * Only bandwidths 20MHz/40MHz are possible on 2.4GHz band. */ - switch (ap_adapter->sessionCtx.ap.sapConfig.ch_width_orig) { + switch (ap_adapter->sessionCtx.ap.sap_config.ch_width_orig) { case CH_WIDTH_20MHZ: channel_type = NL80211_CHAN_HT20; break; case CH_WIDTH_40MHZ: - if (ap_adapter->sessionCtx.ap.sapConfig.sec_ch > - ap_adapter->sessionCtx.ap.sapConfig.channel) + if (ap_adapter->sessionCtx.ap.sap_config.sec_ch > + ap_adapter->sessionCtx.ap.sap_config.channel) channel_type = NL80211_CHAN_HT40PLUS; else channel_type = NL80211_CHAN_HT40MINUS; @@ -9559,7 +9559,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel) cfg80211_chandef_create(&chandef, chan, channel_type); hdd_debug("orig width:%d channel_type:%d freq:%d", - ap_adapter->sessionCtx.ap.sapConfig.ch_width_orig, + ap_adapter->sessionCtx.ap.sap_config.ch_width_orig, channel_type, freq); /* * Doing update after opening and starting pre-cac adapter will make @@ -10088,15 +10088,15 @@ __wlan_hdd_cfg80211_sap_configuration_set(struct wiphy *wiphy, } ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(hostapd_adapter); - ap_ctx->sapConfig.channel = config_channel; - ap_ctx->sapConfig.ch_params.ch_width = - ap_ctx->sapConfig.ch_width_orig; + ap_ctx->sap_config.channel = config_channel; + ap_ctx->sap_config.ch_params.ch_width = + ap_ctx->sap_config.ch_width_orig; ap_ctx->bss_stop_reason = BSS_STOP_DUE_TO_VENDOR_CONFIG_CHAN; wlan_reg_set_channel_params(hdd_ctx->hdd_pdev, - ap_ctx->sapConfig.channel, - ap_ctx->sapConfig.sec_ch, - &ap_ctx->sapConfig.ch_params); + ap_ctx->sap_config.channel, + ap_ctx->sap_config.sec_ch, + &ap_ctx->sap_config.ch_params); hdd_restart_sap(hostapd_adapter); } @@ -10630,7 +10630,7 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason, QDF_STATUS status = QDF_STATUS_SUCCESS; hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); - sap_config = &adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; if (QDF_TIMER_STATE_RUNNING == qdf_mc_timer_get_current_state(&adapter->sessionCtx. @@ -10670,7 +10670,7 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason, case QCA_WLAN_VENDOR_ACS_SELECT_REASON_LTE_COEX: sap_config->acs_cfg.pri_ch = channel_list->pri_ch; sap_config->acs_cfg.ch_width = channel_list->chan_width; - hdd_ap_ctx->sapConfig.ch_width_orig = + hdd_ap_ctx->sap_config.ch_width_orig = channel_list->chan_width; hdd_switch_sap_channel(adapter, sap_config->acs_cfg.pri_ch); break; @@ -15596,7 +15596,7 @@ static bool wlan_hdd_handle_sap_sta_dfs_conc(struct hdd_adapter *adapter, qdf_event_reset(&hostapd_state->qdf_event); status = wlansap_set_channel_change_with_csa( WLAN_HDD_GET_SAP_CTX_PTR(ap_adapter), channel, - hdd_ap_ctx->sapConfig.ch_width_orig, false); + hdd_ap_ctx->sap_config.ch_width_orig, false); if (QDF_STATUS_SUCCESS != status) { hdd_err("Set channel with CSA IE failed, can't allow STA"); @@ -19363,7 +19363,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy, TRACE_CODE_HDD_CFG80211_SET_MAC_ACL, adapter->sessionId, adapter->device_mode)); if (QDF_SAP_MODE == adapter->device_mode) { - pConfig = &adapter->sessionCtx.ap.sapConfig; + pConfig = &adapter->sessionCtx.ap.sap_config; /* default value */ pConfig->num_accept_mac = 0; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 887e972cc35f..c87283365cb8 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -1899,7 +1899,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, { int i; tsap_Config_t *sap_config = - &adapter->sessionCtx.ap.sapConfig; + &adapter->sessionCtx.ap.sap_config; hdd_dfs_indicate_radar(hdd_ctx); wlan_hdd_send_svc_nlink_msg(hdd_ctx->radio_index, @@ -2417,15 +2417,15 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, */ ap_ctx->operatingChannel = pSapEvent->sapevt.sap_ch_selected.pri_ch; - ap_ctx->sapConfig.acs_cfg.pri_ch = + ap_ctx->sap_config.acs_cfg.pri_ch = pSapEvent->sapevt.sap_ch_selected.pri_ch; - ap_ctx->sapConfig.acs_cfg.ht_sec_ch = + ap_ctx->sap_config.acs_cfg.ht_sec_ch = pSapEvent->sapevt.sap_ch_selected.ht_sec_ch; - ap_ctx->sapConfig.acs_cfg.vht_seg0_center_ch = + ap_ctx->sap_config.acs_cfg.vht_seg0_center_ch = pSapEvent->sapevt.sap_ch_selected.vht_seg0_center_ch; - ap_ctx->sapConfig.acs_cfg.vht_seg1_center_ch = + ap_ctx->sap_config.acs_cfg.vht_seg1_center_ch = pSapEvent->sapevt.sap_ch_selected.vht_seg1_center_ch; - ap_ctx->sapConfig.acs_cfg.ch_width = + ap_ctx->sap_config.acs_cfg.ch_width = pSapEvent->sapevt.sap_ch_selected.ch_width; /* Indicate operating channel change to hostapd @@ -2515,15 +2515,15 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, adapter->dev->ifindex); clear_bit(ACS_PENDING, &adapter->event_flags); clear_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags); - ap_ctx->sapConfig.acs_cfg.pri_ch = + ap_ctx->sap_config.acs_cfg.pri_ch = pSapEvent->sapevt.sap_ch_selected.pri_ch; - ap_ctx->sapConfig.acs_cfg.ht_sec_ch = + ap_ctx->sap_config.acs_cfg.ht_sec_ch = pSapEvent->sapevt.sap_ch_selected.ht_sec_ch; - ap_ctx->sapConfig.acs_cfg.vht_seg0_center_ch = + ap_ctx->sap_config.acs_cfg.vht_seg0_center_ch = pSapEvent->sapevt.sap_ch_selected.vht_seg0_center_ch; - ap_ctx->sapConfig.acs_cfg.vht_seg1_center_ch = + ap_ctx->sap_config.acs_cfg.vht_seg1_center_ch = pSapEvent->sapevt.sap_ch_selected.vht_seg1_center_ch; - ap_ctx->sapConfig.acs_cfg.ch_width = + ap_ctx->sap_config.acs_cfg.ch_width = pSapEvent->sapevt.sap_ch_selected.ch_width; /* send vendor event to hostapd only for hostapd based acs*/ if (!hdd_ctx->config->force_sap_acs) @@ -2952,23 +2952,23 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart( } hdd_info("SAP restart orig chan: %d, new chan: %d", - hdd_ap_ctx->sapConfig.channel, intf_ch); - hdd_ap_ctx->sapConfig.channel = intf_ch; - hdd_ap_ctx->sapConfig.ch_params.ch_width = - hdd_ap_ctx->sapConfig.ch_width_orig; + hdd_ap_ctx->sap_config.channel, intf_ch); + hdd_ap_ctx->sap_config.channel = intf_ch; + hdd_ap_ctx->sap_config.ch_params.ch_width = + hdd_ap_ctx->sap_config.ch_width_orig; hdd_ap_ctx->bss_stop_reason = BSS_STOP_DUE_TO_MCC_SCC_SWITCH; wlan_reg_set_channel_params(hdd_ctx->hdd_pdev, - hdd_ap_ctx->sapConfig.channel, - hdd_ap_ctx->sapConfig.sec_ch, - &hdd_ap_ctx->sapConfig.ch_params); - *channel = hdd_ap_ctx->sapConfig.channel; - *sec_ch = hdd_ap_ctx->sapConfig.sec_ch; + hdd_ap_ctx->sap_config.channel, + hdd_ap_ctx->sap_config.sec_ch, + &hdd_ap_ctx->sap_config.ch_params); + *channel = hdd_ap_ctx->sap_config.channel; + *sec_ch = hdd_ap_ctx->sap_config.sec_ch; hdd_info("SAP channel change with CSA/ECSA"); hdd_sap_restart_chan_switch_cb(psoc, vdev_id, - hdd_ap_ctx->sapConfig.channel, - hdd_ap_ctx->sapConfig.ch_params.ch_width); + hdd_ap_ctx->sap_config.channel, + hdd_ap_ctx->sap_config.ch_params.ch_width); return QDF_STATUS_SUCCESS; } @@ -3546,7 +3546,7 @@ static __iw_softap_setparam(struct net_device *dev, { uint8_t preamble = 0, nss = 0, rix = 0; tsap_Config_t *pConfig = - &adapter->sessionCtx.ap.sapConfig; + &adapter->sessionCtx.ap.sap_config; hdd_debug("SET_HT_RATE val %d", set_value); @@ -3609,7 +3609,7 @@ static __iw_softap_setparam(struct net_device *dev, { uint8_t preamble = 0, nss = 0, rix = 0; tsap_Config_t *pConfig = - &adapter->sessionCtx.ap.sapConfig; + &adapter->sessionCtx.ap.sap_config; if (pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac && pConfig->SapHw_mode != eCSR_DOT11_MODE_11ac_ONLY) { @@ -3927,7 +3927,7 @@ static __iw_softap_setparam(struct net_device *dev, case QCASAP_SET_11AX_RATE: ret = hdd_set_11ax_rate(adapter, set_value, &adapter->sessionCtx.ap. - sapConfig); + sap_config); break; case QCASAP_SET_PEER_RATE: ret = hdd_set_peer_rate(adapter, set_value); @@ -6270,10 +6270,10 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit) } if (!reinit) { adapter->sessionCtx.ap.sap_context = sapContext; - adapter->sessionCtx.ap.sapConfig.channel = + adapter->sessionCtx.ap.sap_config.channel = hdd_ctx->acs_policy.acs_channel; acs_dfs_mode = hdd_ctx->acs_policy.acs_dfs_mode; - adapter->sessionCtx.ap.sapConfig.acs_dfs_mode = + adapter->sessionCtx.ap.sap_config.acs_dfs_mode = wlan_hdd_get_dfs_mode(acs_dfs_mode); } @@ -6343,9 +6343,9 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit) hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed: %d", ret); if (!reinit) { - adapter->sessionCtx.ap.sapConfig.acs_cfg.acs_mode = false; - qdf_mem_free(adapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list); - qdf_mem_zero(&adapter->sessionCtx.ap.sapConfig.acs_cfg, + adapter->sessionCtx.ap.sap_config.acs_cfg.acs_mode = false; + qdf_mem_free(adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list); + qdf_mem_zero(&adapter->sessionCtx.ap.sap_config.acs_cfg, sizeof(struct sap_acs_cfg)); } @@ -6664,7 +6664,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy, } else if ((adapter->device_mode == QDF_SAP_MODE) || (adapter->device_mode == QDF_P2P_GO_MODE) ) { - sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sapConfig); + sap_config = &((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config); if (QDF_P2P_GO_MODE == adapter->device_mode) { if (QDF_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(adapter, @@ -7100,7 +7100,7 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter) uint16_t proberesp_ies_len; uint8_t *proberesp_ies = NULL; - pConfig = &adapter->sessionCtx.ap.sapConfig; + pConfig = &adapter->sessionCtx.ap.sap_config; beacon = adapter->sessionCtx.ap.beacon; genie = qdf_mem_malloc(MAX_GENIE_LEN); @@ -7231,7 +7231,7 @@ done: */ static void wlan_hdd_set_sap_hwmode(struct hdd_adapter *adapter) { - tsap_Config_t *pConfig = &adapter->sessionCtx.ap.sapConfig; + tsap_Config_t *pConfig = &adapter->sessionCtx.ap.sap_config; struct hdd_beacon_data *pBeacon = adapter->sessionCtx.ap.beacon; struct ieee80211_mgmt *pMgmt_frame = (struct ieee80211_mgmt *)pBeacon->head; @@ -7299,7 +7299,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter * tHalHandle hal; hal = WLAN_HDD_GET_HAL_CTX(adapter); - sap_config = &adapter->sessionCtx.ap.sapConfig; + sap_config = &adapter->sessionCtx.ap.sap_config; ini_config = hdd_ctx->config; sap_config->enOverLapCh = !!hdd_ctx->config->gEnableOverLapCh; @@ -7315,7 +7315,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter * if (con_sap_adapter) con_sap_config = - &con_sap_adapter->sessionCtx.ap.sapConfig; + &con_sap_adapter->sessionCtx.ap.sap_config; sap_config->acs_cfg.skip_scan_status = eSAP_DO_NEW_ACS_SCAN; @@ -7426,7 +7426,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx, struct hdd_adapter * */ static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter) { - tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sapConfig; + tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sap_config; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); /* Fixed channel 11AC override: @@ -7497,7 +7497,7 @@ static int wlan_hdd_sap_p2p_11ac_overrides(struct hdd_adapter *ap_adapter) */ static int wlan_hdd_setup_acs_overrides(struct hdd_adapter *ap_adapter) { - tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sapConfig; + tsap_Config_t *sap_cfg = &ap_adapter->sessionCtx.ap.sap_config; struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); hdd_debug("** Driver force ACS override **"); @@ -7672,7 +7672,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, clear_bit(ACS_PENDING, &adapter->event_flags); clear_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags); - pConfig = &adapter->sessionCtx.ap.sapConfig; + pConfig = &adapter->sessionCtx.ap.sap_config; pBeacon = adapter->sessionCtx.ap.beacon; @@ -8234,10 +8234,10 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter, error: clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags); - if (adapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list) { - qdf_mem_free(adapter->sessionCtx.ap.sapConfig. + if (adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list) { + qdf_mem_free(adapter->sessionCtx.ap.sap_config. acs_cfg.ch_list); - adapter->sessionCtx.ap.sapConfig.acs_cfg.ch_list = NULL; + adapter->sessionCtx.ap.sap_config.acs_cfg.ch_list = NULL; } free: @@ -8372,9 +8372,9 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, hdd_ctx->is_sap_restart_required = false; qdf_spin_unlock(&hdd_ctx->sap_update_info_lock); } - adapter->sessionCtx.ap.sapConfig.acs_cfg.acs_mode = false; + adapter->sessionCtx.ap.sap_config.acs_cfg.acs_mode = false; wlan_hdd_undo_acs(adapter); - qdf_mem_zero(&adapter->sessionCtx.ap.sapConfig.acs_cfg, + qdf_mem_zero(&adapter->sessionCtx.ap.sap_config.acs_cfg, sizeof(struct sap_acs_cfg)); hdd_debug("Disabling queues"); wlan_hdd_netif_queue_control(adapter, @@ -8549,7 +8549,7 @@ static uint16_t hdd_get_data_rate_from_rate_mask(struct wiphy *wiphy, * @params: Pointet to cfg80211_ap_settings * * This function updates the beacon tx rate which is provided - * as part of cfg80211_ap_settions in to the sapConfig + * as part of cfg80211_ap_settions in to the sap_config * structure * * Return: none @@ -8564,12 +8564,12 @@ static void hdd_update_beacon_rate(struct hdd_adapter *adapter, band = params->chandef.chan->band; beacon_rate_mask = ¶ms->beacon_rate; if (beacon_rate_mask->control[band].legacy) { - adapter->sessionCtx.ap.sapConfig.beacon_tx_rate = + adapter->sessionCtx.ap.sap_config.beacon_tx_rate = hdd_get_data_rate_from_rate_mask(wiphy, band, beacon_rate_mask); hdd_debug("beacon mask value %u, rate %hu", params->beacon_rate.control[0].legacy, - adapter->sessionCtx.ap.sapConfig.beacon_tx_rate); + adapter->sessionCtx.ap.sap_config.beacon_tx_rate); } } #else @@ -8647,7 +8647,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, if (cds_is_sub_20_mhz_enabled()) { enum channel_state ch_state; enum phy_ch_width sub_20_ch_width = CH_WIDTH_INVALID; - tsap_Config_t *sap_cfg = &adapter->sessionCtx.ap.sapConfig; + tsap_Config_t *sap_cfg = &adapter->sessionCtx.ap.sap_config; /* Avoid ACS/DFS, and overwrite ch wd to 20 */ if (channel == 0) { @@ -8733,7 +8733,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, struct hdd_beacon_data *old, *new; enum nl80211_channel_type channel_type; tsap_Config_t *sap_config = - &((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sapConfig); + &((WLAN_HDD_GET_AP_CTX_PTR(adapter))->sap_config); old = adapter->sessionCtx.ap.beacon; @@ -8767,18 +8767,18 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy, /* set authentication type */ switch (params->auth_type) { case NL80211_AUTHTYPE_OPEN_SYSTEM: - adapter->sessionCtx.ap.sapConfig.authType = + adapter->sessionCtx.ap.sap_config.authType = eSAP_OPEN_SYSTEM; break; case NL80211_AUTHTYPE_SHARED_KEY: - adapter->sessionCtx.ap.sapConfig.authType = + adapter->sessionCtx.ap.sap_config.authType = eSAP_SHARED_KEY; break; default: - adapter->sessionCtx.ap.sapConfig.authType = + adapter->sessionCtx.ap.sap_config.authType = eSAP_AUTO_SWITCH; } - adapter->sessionCtx.ap.sapConfig.ch_width_orig = + adapter->sessionCtx.ap.sap_config.ch_width_orig = params->chandef.width; status = wlan_hdd_cfg80211_start_bss(adapter, diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index a88f453f06ba..0c3ba5143b5d 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -7071,16 +7071,16 @@ static uint8_t hdd_get_safe_channel_from_pcl_and_acs_range( hdd_debug("pcl length is zero!"); hdd_debug("start:%d end:%d", - adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch, - adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch); + adapter->sessionCtx.ap.sap_config.acs_cfg.start_ch, + adapter->sessionCtx.ap.sap_config.acs_cfg.end_ch); /* PCL already takes unsafe channel into account */ for (i = 0; i < pcl.pcl_len; i++) { hdd_debug("chan[%d]:%d", i, pcl.pcl_list[i]); if ((pcl.pcl_list[i] >= - adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch) && + adapter->sessionCtx.ap.sap_config.acs_cfg.start_ch) && (pcl.pcl_list[i] <= - adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch)) { + adapter->sessionCtx.ap.sap_config.acs_cfg.end_ch)) { hdd_debug("found PCL safe chan:%d", pcl.pcl_list[i]); return pcl.pcl_list[i]; } @@ -7113,9 +7113,9 @@ static uint8_t hdd_get_safe_channel_from_pcl_and_acs_range( continue; if ((pcl.pcl_list[i] >= - adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch) && + adapter->sessionCtx.ap.sap_config.acs_cfg.start_ch) && (pcl.pcl_list[i] <= - adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch)) { + adapter->sessionCtx.ap.sap_config.acs_cfg.end_ch)) { hdd_debug("found safe chan:%d", pcl.pcl_list[i]); return pcl.pcl_list[i]; } @@ -7155,21 +7155,21 @@ void hdd_switch_sap_channel(struct hdd_adapter *adapter, uint8_t channel) hdd_ctx = WLAN_HDD_GET_CTX(adapter); - hdd_ap_ctx->sapConfig.channel = channel; - hdd_ap_ctx->sapConfig.ch_params.ch_width = - hdd_ap_ctx->sapConfig.ch_width_orig; + hdd_ap_ctx->sap_config.channel = channel; + hdd_ap_ctx->sap_config.ch_params.ch_width = + hdd_ap_ctx->sap_config.ch_width_orig; hdd_debug("chan:%d width:%d", - channel, hdd_ap_ctx->sapConfig.ch_width_orig); + channel, hdd_ap_ctx->sap_config.ch_width_orig); wlan_reg_set_channel_params(hdd_ctx->hdd_pdev, - hdd_ap_ctx->sapConfig.channel, - hdd_ap_ctx->sapConfig.sec_ch, - &hdd_ap_ctx->sapConfig.ch_params); + hdd_ap_ctx->sap_config.channel, + hdd_ap_ctx->sap_config.sec_ch, + &hdd_ap_ctx->sap_config.ch_params); policy_mgr_change_sap_channel_with_csa(hdd_ctx->hdd_psoc, adapter->sessionId, channel, - hdd_ap_ctx->sapConfig.ch_width_orig); + hdd_ap_ctx->sap_config.ch_width_orig); } int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason) @@ -7231,10 +7231,10 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt) } if (!((adapter_temp->device_mode == QDF_SAP_MODE) && - (adapter_temp->sessionCtx.ap.sapConfig.acs_cfg.acs_mode))) { + (adapter_temp->sessionCtx.ap.sap_config.acs_cfg.acs_mode))) { hdd_debug("skip device mode:%d acs:%d", adapter_temp->device_mode, - adapter_temp->sessionCtx.ap.sapConfig. + adapter_temp->sessionCtx.ap.sap_config. acs_cfg.acs_mode); goto next_adapater; } @@ -7276,7 +7276,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt) * the ACS while restart. */ hdd_ctxt->acs_policy.acs_channel = AUTO_CHANNEL_SELECT; - adapter_temp->sessionCtx.ap.sapConfig.channel = + adapter_temp->sessionCtx.ap.sap_config.channel = AUTO_CHANNEL_SELECT; hdd_debug("sending coex indication"); wlan_hdd_send_svc_nlink_msg(hdd_ctxt->radio_index, @@ -7347,7 +7347,7 @@ static void hdd_lte_coex_restart_sap(struct hdd_adapter *adapter, * the ACS while restart. */ hdd_ctx->acs_policy.acs_channel = AUTO_CHANNEL_SELECT; - adapter->sessionCtx.ap.sapConfig.channel = AUTO_CHANNEL_SELECT; + adapter->sessionCtx.ap.sap_config.channel = AUTO_CHANNEL_SELECT; hdd_debug("sending coex indication"); @@ -10855,7 +10855,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit) hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter); hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter); hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter); - sap_config = &ap_adapter->sessionCtx.ap.sapConfig; + sap_config = &ap_adapter->sessionCtx.ap.sap_config; mutex_lock(&hdd_ctx->sap_lock); if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) @@ -10869,7 +10869,7 @@ void wlan_hdd_start_sap(struct hdd_adapter *ap_adapter, bool reinit) qdf_event_reset(&hostapd_state->qdf_event); if (wlansap_start_bss(hdd_ap_ctx->sap_context, hdd_hostapd_sap_event_cb, - &hdd_ap_ctx->sapConfig, + &hdd_ap_ctx->sap_config, ap_adapter->dev) != QDF_STATUS_SUCCESS) goto end; @@ -12459,7 +12459,7 @@ void hdd_restart_sap(struct hdd_adapter *ap_adapter) void *sap_ctx; hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter); - sap_config = &hdd_ap_ctx->sapConfig; + sap_config = &hdd_ap_ctx->sap_config; sap_ctx = hdd_ap_ctx->sap_context; mutex_lock(&hdd_ctx->sap_lock); @@ -12560,9 +12560,9 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void) ap_adapter->sessionCtx.ap.operatingChannel)) { hdd_warn("STA-AP Mode DFS not supported. Restart SAP with Non DFS ACS"); - ap_adapter->sessionCtx.ap.sapConfig.channel = + ap_adapter->sessionCtx.ap.sap_config.channel = AUTO_CHANNEL_SELECT; - ap_adapter->sessionCtx.ap.sapConfig. + ap_adapter->sessionCtx.ap.sap_config. acs_cfg.acs_mode = true; hdd_restart_sap(ap_adapter); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 0c6503e73739..26193c9abe4f 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -520,7 +520,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy, /* Block All Scan during DFS operation and send null scan result */ con_sap_adapter = hdd_get_con_sap_adapter(adapter, true); if (con_sap_adapter) { - con_dfs_ch = con_sap_adapter->sessionCtx.ap.sapConfig.channel; + con_dfs_ch = con_sap_adapter->sessionCtx.ap.sap_config.channel; if (con_dfs_ch == AUTO_CHANNEL_SELECT) con_dfs_ch = con_sap_adapter->sessionCtx.ap.operatingChannel;