wlan: Add support for SAP restart in case of lte coex event
In case of lte coex event, currently driver stops the SAP and
waits for framework to restart it again.
Add changes for SAP to restart internally in case of lte coex
event.
Change-Id: I097008bb2fec490b27471d06619522c45c719a1d
CRs-Fixed: 1101834
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 5b0c047..878c359 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -3020,6 +3020,10 @@
#define CFG_DISABLE_SCAN_DURING_SCO_MAX (1)
#define CFG_DISABLE_SCAN_DURING_SCO_DEFAULT (0)
+#define CFG_CH_AVOID_SAP_RESTART_NAME "sap_ch_avoid_restart"
+#define CFG_CH_AVOID_SAP_RESTART_MIN (0)
+#define CFG_CH_AVOID_SAP_RESTART_MAX (1)
+#define CFG_CH_AVOID_SAP_RESTART_DEFAULT (1)
/*
* maximum interval (in seconds) for a
@@ -3624,6 +3628,7 @@
v_BOOL_t sendMgmtPktViaWQ5;
v_BOOL_t sap_probe_resp_offload;
v_BOOL_t disable_scan_during_sco;
+ v_BOOL_t sap_restrt_ch_avoid;
#ifdef SAP_AUTH_OFFLOAD
bool enable_sap_auth_offload;
uint32_t sap_auth_offload_sec_type;
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index b789ea2..7d789fa 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1440,4 +1440,19 @@
struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter,
tSirBssDescription *bss_desc);
+#ifdef CFG80211_DEL_STA_V2
+int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+ struct net_device *dev,
+ struct station_del_parameters *param);
+#else
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) || defined(WITH_BACKPORTS)
+int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+ struct net_device *dev, const u8 *mac);
+#else
+int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+ struct net_device *dev, u8 *mac);
+#endif
+#endif
+
+int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *pHostapdAdapter);
#endif
diff --git a/CORE/HDD/inc/wlan_hdd_hostapd.h b/CORE/HDD/inc/wlan_hdd_hostapd.h
index 1a4c15a..937d50f 100644
--- a/CORE/HDD/inc/wlan_hdd_hostapd.h
+++ b/CORE/HDD/inc/wlan_hdd_hostapd.h
@@ -87,6 +87,26 @@
u_int16_t gen_ie_len,
u_int8_t *gen_ie );
+/**
+ * hdd_change_ch_avoidance_status() - update is_ch_avoid_in_progress flag
+ *
+ * @hdd_ctx: pointer to hdd context
+ * @value: value to set
+ *
+ * This function will change the value of is_ch_avoid_in_progress
+ *
+ * Return: none
+ */
+static inline void
+hdd_change_ch_avoidance_status(hdd_context_t *hdd_ctx,
+ bool value)
+{
+ vos_spin_lock_acquire(&hdd_ctx->sap_update_info_lock);
+ hdd_ctx->is_ch_avoid_in_progress = value;
+ vos_spin_lock_release(&hdd_ctx->sap_update_info_lock);
+}
+
+
VOS_STATUS hdd_hostapd_SAPEventCB( tpSap_Event pSapEvent, v_PVOID_t usrDataForCallback);
VOS_STATUS hdd_init_ap_mode( hdd_adapter_t *pAdapter );
void hdd_set_ap_ops( struct net_device *pWlanHostapdDev );
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 223ba13..e52d7ae 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -563,8 +563,14 @@
#endif /* FEATURE_WLAN_WAPI */
typedef struct beacon_data_s {
- u8 *head, *tail;
- int head_len, tail_len;
+ u8 *head;
+ u8 *tail;
+ u8 *proberesp_ies;
+ u8 *assocresp_ies;
+ int head_len;
+ int tail_len;
+ int proberesp_ies_len;
+ int assocresp_ies_len;
int dtim_period;
} beacon_data_t;
@@ -1499,6 +1505,11 @@
/* Lock to avoid race condtion during start/stop bss*/
struct mutex sap_lock;
+ struct work_struct sap_start_work;
+ bool is_sap_restart_required;
+ bool is_ch_avoid_in_progress;
+ vos_spin_lock_t sap_update_info_lock;
+
/* Lock to avoid race condtion between ROC timeout and
cancel callbacks*/
struct mutex roc_lock;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 8f26b7e..1de4671 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -3750,6 +3750,13 @@
CFG_SAP_PROBE_RESP_OFFLOAD_MIN,
CFG_SAP_PROBE_RESP_OFFLOAD_MAX),
+ REG_VARIABLE(CFG_CH_AVOID_SAP_RESTART_NAME, WLAN_PARAM_Integer,
+ hdd_config_t, sap_restrt_ch_avoid,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_CH_AVOID_SAP_RESTART_DEFAULT,
+ CFG_CH_AVOID_SAP_RESTART_MIN,
+ CFG_CH_AVOID_SAP_RESTART_MAX),
+
REG_VARIABLE(CFG_DISABLE_SCAN_DURING_SCO, WLAN_PARAM_Integer,
hdd_config_t, disable_scan_during_sco,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@@ -4528,6 +4535,9 @@
"Name = [gEnableSAPAuthOffload] Value = [%u] ",
pHddCtx->cfg_ini->enable_sap_auth_offload);
#endif
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_HIGH,
+ "Name = [sap_ch_avoid_restart] Value = [%u] ",
+ pHddCtx->cfg_ini->sap_restrt_ch_avoid);
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 4e45232..cd5f5ab 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8448,7 +8448,8 @@
int size;
beacon_data_t *beacon = NULL;
beacon_data_t *old = NULL;
- int head_len,tail_len;
+ int head_len, tail_len, proberesp_ies_len, assocresp_ies_len;
+ const u8 *head, *tail, *proberesp_ies, *assocresp_ies;
ENTER();
if (params->head && !params->head_len)
@@ -8485,20 +8486,50 @@
}
#endif
- if(params->head)
+ if (params->head)
+ {
head_len = params->head_len;
- else
+ head = params->head;
+ } else
+ {
head_len = old->head_len;
+ head = old->head;
+ }
- if(params->tail || !old)
+ if (params->tail || !old)
+ {
tail_len = params->tail_len;
- else
+ tail = params->tail;
+ } else
+ {
tail_len = old->tail_len;
+ tail = old->tail;
+ }
- size = sizeof(beacon_data_t) + head_len + tail_len;
+ if (params->proberesp_ies || !old)
+ {
+ proberesp_ies_len = params->proberesp_ies_len;
+ proberesp_ies = params->proberesp_ies;
+ } else
+ {
+ proberesp_ies_len = old->proberesp_ies_len;
+ proberesp_ies = old->proberesp_ies;
+ }
+
+ if (params->assocresp_ies || !old)
+ {
+ assocresp_ies_len = params->assocresp_ies_len;
+ assocresp_ies = params->assocresp_ies;
+ } else
+ {
+ assocresp_ies_len = old->assocresp_ies_len;
+ assocresp_ies = old->assocresp_ies;
+ }
+
+ size = sizeof(beacon_data_t) + head_len + tail_len +
+ proberesp_ies_len + assocresp_ies_len;
beacon = kzalloc(size, GFP_KERNEL);
-
if( beacon == NULL )
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -8507,12 +8538,12 @@
}
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
- if(params->dtim_period || !old )
+ if (params->dtim_period)
beacon->dtim_period = params->dtim_period;
else
beacon->dtim_period = old->dtim_period;
#else
- if(dtim_period || !old )
+ if (dtim_period)
beacon->dtim_period = dtim_period;
else
beacon->dtim_period = old->dtim_period;
@@ -8520,31 +8551,24 @@
beacon->head = ((u8 *) beacon) + sizeof(beacon_data_t);
beacon->tail = beacon->head + head_len;
+ beacon->proberesp_ies = beacon->tail + tail_len;
+ beacon->assocresp_ies = beacon->proberesp_ies + proberesp_ies_len;
+
beacon->head_len = head_len;
beacon->tail_len = tail_len;
+ beacon->proberesp_ies_len = proberesp_ies_len;
+ beacon->assocresp_ies_len= assocresp_ies_len;
- if(params->head) {
- memcpy (beacon->head,params->head,beacon->head_len);
- }
- else {
- if(old)
- memcpy (beacon->head,old->head,beacon->head_len);
- }
-
- if(params->tail) {
- memcpy (beacon->tail,params->tail,beacon->tail_len);
- }
- else {
- if(old)
- memcpy (beacon->tail,old->tail,beacon->tail_len);
- }
+ memcpy(beacon->head, head, head_len);
+ memcpy(beacon->tail, tail, tail_len);
+ memcpy(beacon->proberesp_ies, proberesp_ies, proberesp_ies_len);
+ memcpy(beacon->assocresp_ies, assocresp_ies, assocresp_ies_len);
*ppBeacon = beacon;
kfree(old);
return 0;
-
}
v_U8_t* wlan_hdd_cfg80211_get_ie_ptr(
@@ -8759,18 +8783,13 @@
return;
}
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0))
-static int wlan_hdd_cfg80211_update_apies(hdd_adapter_t* pHostapdAdapter,
- struct beacon_parameters *params)
-#else
-static int wlan_hdd_cfg80211_update_apies(hdd_adapter_t* pHostapdAdapter,
- struct cfg80211_beacon_data *params)
-#endif
+int wlan_hdd_cfg80211_update_apies(hdd_adapter_t *pHostapdAdapter)
{
v_U8_t *genie;
v_U8_t total_ielen = 0;
v_U8_t addIE[1] = {0};
int ret = 0;
+ beacon_data_t *pBeacon = NULL;
genie = vos_mem_malloc(MAX_GENIE_LEN);
@@ -8779,6 +8798,7 @@
return -ENOMEM;
}
+ pBeacon = pHostapdAdapter->sessionCtx.ap.beacon;
if (0 != wlan_hdd_add_ie(pHostapdAdapter, genie,
&total_ielen, WPS_OUI_TYPE, WPS_OUI_TYPE_SIZE))
{
@@ -8836,9 +8856,9 @@
}
// Added for ProResp IE
- if ( (params->proberesp_ies != NULL) && (params->proberesp_ies_len != 0) )
+ if ((pBeacon->proberesp_ies != NULL) && (pBeacon->proberesp_ies_len != 0))
{
- u16 rem_probe_resp_ie_len = params->proberesp_ies_len;
+ u16 rem_probe_resp_ie_len = pBeacon->proberesp_ies_len;
u8 probe_rsp_ie_len[3] = {0};
u8 counter = 0;
/* Check Probe Resp Length if it is greater then 255 then Store
@@ -8866,7 +8886,8 @@
{
if (ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal,
WNI_CFG_PROBE_RSP_ADDNIE_DATA1,
- (tANI_U8*)¶ms->proberesp_ies[rem_probe_resp_ie_len],
+ (tANI_U8*)&pBeacon->
+ proberesp_ies[rem_probe_resp_ie_len],
probe_rsp_ie_len[0], NULL,
eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
{
@@ -8882,7 +8903,8 @@
{
if (ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal,
WNI_CFG_PROBE_RSP_ADDNIE_DATA2,
- (tANI_U8*)¶ms->proberesp_ies[rem_probe_resp_ie_len],
+ (tANI_U8*)&pBeacon->
+ proberesp_ies[rem_probe_resp_ie_len],
probe_rsp_ie_len[1], NULL,
eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
{
@@ -8898,7 +8920,8 @@
{
if (ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal,
WNI_CFG_PROBE_RSP_ADDNIE_DATA3,
- (tANI_U8*)¶ms->proberesp_ies[rem_probe_resp_ie_len],
+ (tANI_U8*)&pBeacon->
+ proberesp_ies[rem_probe_resp_ie_len],
probe_rsp_ie_len[2], NULL,
eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
{
@@ -8955,11 +8978,11 @@
}
// Added for AssocResp IE
- if ( (params->assocresp_ies != NULL) && (params->assocresp_ies_len != 0) )
+ if ((pBeacon->assocresp_ies != NULL) && (pBeacon->assocresp_ies_len != 0))
{
if (ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal,
- WNI_CFG_ASSOC_RSP_ADDNIE_DATA, (tANI_U8*)params->assocresp_ies,
- params->assocresp_ies_len, NULL,
+ WNI_CFG_ASSOC_RSP_ADDNIE_DATA, (tANI_U8*)pBeacon->assocresp_ies,
+ pBeacon->assocresp_ies_len, NULL,
eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE)
{
hddLog(LOGE,
@@ -9388,7 +9411,6 @@
int status = VOS_STATUS_SUCCESS;
tpWLAN_SAPEventCB pSapEventCallback;
hdd_hostapd_state_t *pHostapdState;
- v_U8_t wpaRsnIEdata[(SIR_MAC_MAX_IE_LENGTH * 2)+4]; //Max ie length 255 * 2(WPA+RSN) + 2 bytes (vendor specific ID) * 2
v_CONTEXT_t pVosContext = (WLAN_HDD_GET_CTX(pHostapdAdapter))->pvosContext;
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
struct qc_mac_acl_entry *acl_entry = NULL;
@@ -9400,6 +9422,8 @@
v_BOOL_t MFPRequired = VOS_FALSE;
v_BOOL_t sapEnable11AC =
(WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->sapEnable11AC;
+ u_int16_t prev_rsn_length = 0;
+
ENTER();
iniConfig = pHddCtx->cfg_ini;
@@ -9552,14 +9576,18 @@
eCSR_ENCRYPT_TYPE_NONE;
pConfig->RSNWPAReqIELength = 0;
- pConfig->pRSNWPAReqIE = NULL;
+ memset(&pConfig->RSNWPAReqIE[0], 0, sizeof(pConfig->RSNWPAReqIE));
pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
WLAN_EID_RSN);
if(pIe && pIe[1])
{
pConfig->RSNWPAReqIELength = pIe[1] + 2;
- memcpy(&wpaRsnIEdata[0], pIe, pConfig->RSNWPAReqIELength);
- pConfig->pRSNWPAReqIE = &wpaRsnIEdata[0];
+ if (pConfig->RSNWPAReqIELength <= sizeof(pConfig->RSNWPAReqIE))
+ memcpy(&pConfig->RSNWPAReqIE[0], pIe,
+ pConfig->RSNWPAReqIELength);
+ else
+ hddLog(LOGE, "RSNWPA IE MAX Length exceeded; length =%d",
+ pConfig->RSNWPAReqIELength);
/* The actual processing may eventually be more extensive than
* this. Right now, just consume any PMKIDs that are sent in
* by the app.
@@ -9571,8 +9599,8 @@
&RSNAuthType,
&MFPCapable,
&MFPRequired,
- pConfig->pRSNWPAReqIE[1]+2,
- pConfig->pRSNWPAReqIE );
+ pConfig->RSNWPAReqIE[1]+2,
+ pConfig->RSNWPAReqIE);
if( VOS_STATUS_SUCCESS == status )
{
@@ -9594,17 +9622,29 @@
if(pIe && pIe[1] && (pIe[0] == DOT11F_EID_WPA))
{
- if (pConfig->pRSNWPAReqIE)
+ if (pConfig->RSNWPAReqIE[0])
{
/*Mixed mode WPA/WPA2*/
- memcpy((&wpaRsnIEdata[0] + pConfig->RSNWPAReqIELength), pIe, pIe[1] + 2);
+ prev_rsn_length = pConfig->RSNWPAReqIELength;
pConfig->RSNWPAReqIELength += pIe[1] + 2;
+ if (pConfig->RSNWPAReqIELength <=
+ (sizeof(pConfig->RSNWPAReqIE) - prev_rsn_length))
+ memcpy(&pConfig->RSNWPAReqIE[0] + prev_rsn_length, pIe,
+ pIe[1] + 2);
+ else
+ hddLog(LOGE, "RSNWPA IE MAX Length exceeded; length =%d",
+ pConfig->RSNWPAReqIELength);
+
}
else
{
pConfig->RSNWPAReqIELength = pIe[1] + 2;
- memcpy(&wpaRsnIEdata[0], pIe, pConfig->RSNWPAReqIELength);
- pConfig->pRSNWPAReqIE = &wpaRsnIEdata[0];
+ if (pConfig->RSNWPAReqIELength <= sizeof(pConfig->RSNWPAReqIE))
+ memcpy(&pConfig->RSNWPAReqIE[0], pIe,
+ pConfig->RSNWPAReqIELength);
+ else
+ hddLog(LOGE, "RSNWPA IE MAX Length exceeded; length =%d",
+ pConfig->RSNWPAReqIELength);
status = hdd_softap_unpackIE(
vos_get_context( VOS_MODULE_ID_SME, pVosContext),
&RSNEncryptType,
@@ -9612,8 +9652,8 @@
&RSNAuthType,
&MFPCapable,
&MFPRequired,
- pConfig->pRSNWPAReqIE[1]+2,
- pConfig->pRSNWPAReqIE );
+ pConfig->RSNWPAReqIE[1]+2,
+ pConfig->RSNWPAReqIE);
if( VOS_STATUS_SUCCESS == status )
{
@@ -9631,7 +9671,7 @@
}
}
- if (pConfig->RSNWPAReqIELength > sizeof wpaRsnIEdata) {
+ if (pConfig->RSNWPAReqIELength > sizeof(pConfig->RSNWPAReqIE)) {
hddLog( VOS_TRACE_LEVEL_ERROR, "**RSNWPAReqIELength is too large***");
return -EINVAL;
}
@@ -9758,7 +9798,7 @@
pConfig->ht_capab =
(WLAN_HDD_GET_CTX(pHostapdAdapter))->cfg_ini->apProtection;
- if ( 0 != wlan_hdd_cfg80211_update_apies(pHostapdAdapter, params) )
+ if ( 0 != wlan_hdd_cfg80211_update_apies(pHostapdAdapter))
{
hddLog(LOGE, FL("SAP Not able to set AP IEs"));
return -EINVAL;
@@ -16817,15 +16857,15 @@
}
#ifdef CFG80211_DEL_STA_V2
-static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
struct net_device *dev,
struct station_del_parameters *param)
#else
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0))
-static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
struct net_device *dev, const u8 *mac)
#else
-static int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
+int wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac)
#endif
#endif
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 2849a58..a61b3c1 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2169,6 +2169,7 @@
}
vos_flush_delayed_work(&pHddCtx->spoof_mac_addr_work);
+ vos_flush_work(&pHddCtx->sap_start_work);
hdd_reset_all_adapters(pHddCtx);
/* set default value of Tcp delack and stop timer */
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index b86487a..d8c7d11 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -972,7 +972,6 @@
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: WLANSAP_SetKeySta failed idx %d", __func__, i);
}
- pHddApCtx->wepKey[i].keyLength = 0;
}
}
//Fill the params for sending IWEVCUSTOM Event with SOFTAP.enabled
@@ -1548,6 +1547,54 @@
return;
}
+/**
+ * hdd_unsafe_channel_restart_sap - restart sap if sap is on unsafe channel
+ * @adapter: hdd ap adapter
+ *
+ * hdd_unsafe_channel_restart_sap check all unsafe channel list
+ * and if ACS is enabled, driver will ask userspace to restart the
+ * sap. User space on LTE coex indication restart driver.
+ *
+ * Return - none
+ */
+static void hdd_unsafe_channel_restart_sap(hdd_adapter_t *adapter,
+ hdd_context_t *hdd_ctx)
+{
+
+ if (!(adapter && (WLAN_HDD_SOFTAP == adapter->device_mode))) {
+ return;
+ }
+
+ hddLog(LOG1, FL("Current operation channel %d"),
+ adapter->sessionCtx.ap.operatingChannel);
+ if (false == hdd_ctx->is_ch_avoid_in_progress) {
+ hdd_change_ch_avoidance_status(hdd_ctx, true);
+
+ vos_flush_work(
+ &hdd_ctx->sap_start_work);
+
+ /*
+ * current operating channel
+ * is un-safe channel, restart SAP
+ */
+ hddLog(LOG1,
+ FL("Restarting SAP due to unsafe channel"));
+
+ adapter->sessionCtx.ap.sapConfig.channel =
+ AUTO_CHANNEL_SELECT;
+
+ netif_tx_disable(adapter->dev);
+
+ if (hdd_ctx->cfg_ini->sap_restrt_ch_avoid)
+ schedule_work(
+ &hdd_ctx->sap_start_work);
+
+ return;
+ }
+ return;
+}
+
+
/**---------------------------------------------------------------------------
\brief hdd_hostapd_ch_avoid_cb() -
@@ -1564,7 +1611,7 @@
--------------------------------------------------------------------------*/
void hdd_hostapd_ch_avoid_cb
(
- void *pAdapter,
+ void *context,
void *indParam
)
{
@@ -1590,14 +1637,14 @@
#endif
/* Basic sanity */
- if ((NULL == pAdapter) || (NULL == indParam))
+ if ((NULL == context) || (NULL == indParam))
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s : Invalid arguments", __func__);
return;
}
- hddCtxt = (hdd_context_t *)pAdapter;
+ hddCtxt = (hdd_context_t *)context;
chAvoidInd = (tSirChAvoidIndType *)indParam;
pVosContext = hddCtxt->pvosContext;
@@ -1722,7 +1769,7 @@
{
/* current operating channel is un-safe channel
* restart driver */
- hdd_hostapd_stop(pHostapdAdapter->dev);
+ hdd_unsafe_channel_restart_sap(pHostapdAdapter, hddCtxt);
/* On LE, this event is handled by wlan-services to
* restart SAP. On android, this event would be
* ignored.
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index e175267..3876065 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -9235,6 +9235,137 @@
return VOS_STATUS_SUCCESS;
}
+/**
+ * wlan_hdd_restart_sap() - to restart SAP in driver internally
+ * @ap_adapter: - Pointer to SAP hdd_adapter_t structure
+ *
+ * wlan_hdd_restart_sap first delete SAP and do cleanup.
+ * After that WLANSAP_StartBss start re-start process of SAP.
+ *
+ * Return: None
+ */
+static void wlan_hdd_restart_sap(hdd_adapter_t *ap_adapter)
+{
+ hdd_ap_ctx_t *pHddApCtx;
+ hdd_hostapd_state_t *pHostapdState;
+ VOS_STATUS vos_status;
+ hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(ap_adapter);
+#ifdef CFG80211_DEL_STA_V2
+ struct station_del_parameters delStaParams;
+#endif
+ tsap_Config_t *pConfig;
+
+ pHddApCtx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
+ pConfig = &pHddApCtx->sapConfig;
+
+ mutex_lock(&pHddCtx->sap_lock);
+ if (test_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags)) {
+#ifdef CFG80211_DEL_STA_V2
+ delStaParams.mac = NULL;
+ delStaParams.subtype = SIR_MAC_MGMT_DEAUTH >> 4;
+ delStaParams.reason_code = eCsrForcedDeauthSta;
+ wlan_hdd_cfg80211_del_station(ap_adapter->wdev.wiphy, ap_adapter->dev,
+ &delStaParams);
+#else
+ wlan_hdd_cfg80211_del_station(ap_adapter->wdev.wiphy, ap_adapter->dev,
+ NULL);
+#endif
+ hdd_cleanup_actionframe(pHddCtx, ap_adapter);
+
+ pHostapdState = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);
+ vos_event_reset(&pHostapdState->vosEvent);
+
+ if (VOS_STATUS_SUCCESS == WLANSAP_StopBss(pHddCtx->pvosContext)) {
+ vos_status = vos_wait_single_event(&pHostapdState->vosEvent,
+ 10000);
+ if (!VOS_IS_STATUS_SUCCESS(vos_status)) {
+ hddLog(LOGE, FL("SAP Stop Failed"));
+ goto end;
+ }
+ }
+ clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
+ wlan_hdd_decr_active_session(pHddCtx, ap_adapter->device_mode);
+ hddLog(LOG1, FL("SAP Stop Success"));
+
+ if (0 != wlan_hdd_cfg80211_update_apies(ap_adapter)) {
+ hddLog(LOGE, FL("SAP Not able to set AP IEs"));
+ goto end;
+ }
+
+ if (WLANSAP_StartBss(pHddCtx->pvosContext, hdd_hostapd_SAPEventCB,
+ pConfig, (v_PVOID_t)ap_adapter->dev) != VOS_STATUS_SUCCESS) {
+ hddLog(LOGE, FL("SAP Start Bss fail"));
+ goto end;
+ }
+
+ hddLog(LOG1, FL("Waiting for SAP to start"));
+ vos_status = vos_wait_single_event(&pHostapdState->vosEvent, 10000);
+ if (!VOS_IS_STATUS_SUCCESS(vos_status)) {
+ hddLog(LOGE, FL("SAP Start failed"));
+ goto end;
+ }
+ hddLog(LOG1, FL("SAP Start Success"));
+ set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
+ wlan_hdd_incr_active_session(pHddCtx, ap_adapter->device_mode);
+ pHostapdState->bCommit = TRUE;
+ }
+end:
+ mutex_unlock(&pHddCtx->sap_lock);
+ return;
+}
+
+/**
+ * __hdd_sap_restart_handle() - to handle restarting of SAP
+ * @work: name of the work
+ *
+ * Purpose of this function is to trigger sap start. this function
+ * will be called from workqueue.
+ *
+ * Return: void.
+ */
+static void __hdd_sap_restart_handle(struct work_struct *work)
+{
+ hdd_adapter_t *sap_adapter;
+ hdd_context_t *hdd_ctx = container_of(work,
+ hdd_context_t,
+ sap_start_work);
+ if (0 != wlan_hdd_validate_context(hdd_ctx)) {
+ vos_ssr_unprotect(__func__);
+ return;
+ }
+ sap_adapter = hdd_get_adapter(hdd_ctx,
+ WLAN_HDD_SOFTAP);
+ if (sap_adapter == NULL) {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ FL("sap_adapter is NULL"));
+ vos_ssr_unprotect(__func__);
+ return;
+ }
+
+ if (hdd_ctx->is_ch_avoid_in_progress) {
+ sap_adapter->sessionCtx.ap.sapConfig.channel = AUTO_CHANNEL_SELECT;
+ wlan_hdd_restart_sap(sap_adapter);
+ hdd_change_ch_avoidance_status(hdd_ctx, false);
+ }
+}
+
+/**
+ * hdd_sap_restart_handle() - to handle restarting of SAP
+ * @work: name of the work
+ *
+ * Purpose of this function is to trigger sap start. this function
+ * will be called from workqueue.
+ *
+ * Return: void.
+ */
+static void hdd_sap_restart_handle(struct work_struct *work)
+{
+ vos_ssr_protect(__func__);
+ __hdd_sap_restart_handle(work);
+ vos_ssr_unprotect(__func__);
+}
+
+
VOS_STATUS hdd_stop_all_adapters( hdd_context_t *pHddCtx )
{
hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
@@ -10689,6 +10820,7 @@
hdd_close_all_adapters( pHddCtx );
vos_flush_delayed_work(&pHddCtx->spoof_mac_addr_work);
+ vos_flush_work(&pHddCtx->sap_start_work);
free_hdd_ctx:
/* free the power on lock from platform driver */
@@ -11673,11 +11805,13 @@
#endif /* WLAN_FEATURE_EXTSCAN */
spin_lock_init(&pHddCtx->schedScan_lock);
+ vos_spin_lock_init(&pHddCtx->sap_update_info_lock);
hdd_list_init( &pHddCtx->hddAdapters, MAX_NUMBER_OF_ADAPTERS );
vos_init_delayed_work(&pHddCtx->spoof_mac_addr_work,
hdd_processSpoofMacAddrRequest);
+ vos_init_work(&pHddCtx->sap_start_work, hdd_sap_restart_handle);
#ifdef FEATURE_WLAN_TDLS
/* tdls_lock is initialized before an hdd_open_adapter ( which is
diff --git a/CORE/SAP/inc/sapApi.h b/CORE/SAP/inc/sapApi.h
index d05bdb9..390e10b 100644
--- a/CORE/SAP/inc/sapApi.h
+++ b/CORE/SAP/inc/sapApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013,2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2013, 2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -427,8 +427,8 @@
v_U8_t dtim_period; /* dtim interval */
v_U8_t num_accept_mac;
v_U8_t num_deny_mac;
- v_U8_t *pRSNWPAReqIE; //If not null, it has the IE byte stream for RSN /WPA
-
+ /* Max ie length 255 * 2(WPA+RSN) + 2 bytes(vendor specific ID) * 2 */
+ v_U8_t RSNWPAReqIE[(SIR_MAC_MAX_IE_LENGTH * 2) + 4];
v_U8_t countryCode[WNI_CFG_COUNTRY_CODE_LEN]; //it is ignored if [0] is 0.
v_U8_t RSNAuthType;
v_U8_t RSNEncryptType;
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 4ebbae5..9e48d8c 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -1337,7 +1337,8 @@
VOS_TRACE(VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR, " %s Fail to alloc memory", __func__);
return eSAP_STATUS_FAILURE;
}
- vos_mem_copy(profile->pRSNReqIE, pconfig_params->pRSNWPAReqIE, pconfig_params->RSNWPAReqIELength);
+ vos_mem_copy(profile->pRSNReqIE, pconfig_params->RSNWPAReqIE,
+ pconfig_params->RSNWPAReqIELength);
profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength;
}