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/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