wlan: Enhancement of GTK rekey offload.
Earlier case supplicant was handling GTK rekeying
even when wlan suspended thus wlan host had to
come out from the sleep for GTK rekeying.
with this change, support for GTK offload has been added
so that firmware will take care of GTK rekey when
wlan is in suspend mode.
Enhancement of "wlan: Support for GTK rekey offload"
CRs-fixed: 467114
Change-Id: I5d90f5b51f47e851704b1007388686c66e39c7dc
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 80f686f..8dcf27f 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -519,14 +519,6 @@
HDD_SSR_DISABLED,
}e_hdd_ssr_required;
-#ifdef WLAN_FEATURE_GTK_OFFLOAD
-typedef struct
-{
- v_BOOL_t requested;
- tSirGtkOffloadParams gtkOffloadReqParams;
-}hddGtkOffloadParams;
-#endif
-
struct hdd_station_ctx
{
/** Handle to the Wireless Extension State */
@@ -549,7 +541,7 @@
#endif
#ifdef WLAN_FEATURE_GTK_OFFLOAD
- hddGtkOffloadParams gtkOffloadRequestParams;
+ tSirGtkOffloadParams gtkOffloadReqParams;
#endif
/*Increment whenever ibss New peer joins and departs the network */
int ibss_sta_generation;
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index ada1011..6d14872 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -863,9 +863,9 @@
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode))
{
- pHddStaCtx->gtkOffloadRequestParams.requested = FALSE;
- memset(&pHddStaCtx->gtkOffloadRequestParams.gtkOffloadReqParams,
- 0, sizeof (tSirGtkOffloadParams));
+ memset(&pHddStaCtx->gtkOffloadReqParams, 0,
+ sizeof (tSirGtkOffloadParams));
+ pHddStaCtx->gtkOffloadReqParams.ulFlags = GTK_OFFLOAD_DISABLE;
}
#endif
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 933f5a8..7fff486 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4900,13 +4900,13 @@
}
#endif /* FEATURE_WLAN_WAPI */
#ifdef WLAN_FEATURE_GTK_OFFLOAD
- /* Initializing gtkOffloadRequestParams */
+ /* Initializing gtkOffloadReqParams */
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode))
{
- pHddStaCtx->gtkOffloadRequestParams.requested = FALSE;
- memset(&pHddStaCtx->gtkOffloadRequestParams.gtkOffloadReqParams,
- 0, sizeof (tSirGtkOffloadParams));
+ memset(&pHddStaCtx->gtkOffloadReqParams, 0,
+ sizeof (tSirGtkOffloadParams));
+ pHddStaCtx->gtkOffloadReqParams.ulFlags = GTK_OFFLOAD_DISABLE;
}
#endif
pRoamProfile->csrPersona = pAdapter->device_mode;
@@ -7783,6 +7783,8 @@
{
hdd_adapter_t *pAdapter = (hdd_adapter_t *)callbackContext;
+ tANI_U8 tempReplayCounter[8];
+ hdd_station_ctx_t *pHddStaCtx;
ENTER();
@@ -7808,9 +7810,27 @@
return ;
}
+ pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+ /* Update replay counter */
+ pHddStaCtx->gtkOffloadReqParams.ullKeyReplayCounter =
+ pGtkOffloadGetInfoRsp->ullKeyReplayCounter;
+
+ {
+ /* changing from little to big endian since supplicant
+ * works on big endian format
+ */
+ int i;
+ tANI_U8 *p = (tANI_U8 *)&pGtkOffloadGetInfoRsp->ullKeyReplayCounter;
+
+ for (i = 0; i < 8; i++)
+ {
+ tempReplayCounter[7-i] = (tANI_U8)p[i];
+ }
+ }
+
/* Update replay counter to NL */
cfg80211_gtk_rekey_notify(pAdapter->dev, pGtkOffloadGetInfoRsp->bssId,
- (tANI_U8 *)&pGtkOffloadGetInfoRsp->ullKeyReplayCounter, GFP_KERNEL);
+ tempReplayCounter, GFP_KERNEL);
}
/*
@@ -7825,7 +7845,7 @@
hdd_station_ctx_t *pHddStaCtx;
tHalHandle hHal;
int result;
- tpSirGtkOffloadParams pGtkOffloadReqParams;
+ tSirGtkOffloadParams hddGtkOffloadReqParams;
eHalStatus status = eHAL_STATUS_FAILURE;
ENTER();
@@ -7855,21 +7875,31 @@
return -EAGAIN;
}
- pGtkOffloadReqParams =
- &pHddStaCtx->gtkOffloadRequestParams.gtkOffloadReqParams;
-
- pGtkOffloadReqParams->ulFlags = GTK_OFFLOAD_ENABLE;
- memcpy(pGtkOffloadReqParams->aKCK, data->kck, NL80211_KCK_LEN);
- memcpy(pGtkOffloadReqParams->aKEK, data->kek, NL80211_KEK_LEN);
- memcpy(pGtkOffloadReqParams->bssId, &pHddStaCtx->conn_info.bssId,
+ pHddStaCtx->gtkOffloadReqParams.ulFlags = GTK_OFFLOAD_ENABLE;
+ memcpy(pHddStaCtx->gtkOffloadReqParams.aKCK, data->kck, NL80211_KCK_LEN);
+ memcpy(pHddStaCtx->gtkOffloadReqParams.aKEK, data->kek, NL80211_KEK_LEN);
+ memcpy(pHddStaCtx->gtkOffloadReqParams.bssId, &pHddStaCtx->conn_info.bssId,
WNI_CFG_BSSID_LEN);
- memcpy(&pGtkOffloadReqParams->ullKeyReplayCounter, &data->replay_ctr,
- sizeof (tANI_U64));
+ {
+ /* changing from big to little endian since driver
+ * works on little endian format
+ */
+ tANI_U8 *p =
+ (tANI_U8 *)&pHddStaCtx->gtkOffloadReqParams.ullKeyReplayCounter;
+ int i;
+
+ for (i = 0; i < 8; i++)
+ {
+ p[7-i] = data->replay_ctr[i];
+ }
+ }
if (TRUE == pHddCtx->hdd_wlan_suspended)
{
/* if wlan is suspended, enable GTK offload directly from here */
- status = sme_SetGTKOffload(hHal, pGtkOffloadReqParams,
+ memcpy(&hddGtkOffloadReqParams, &pHddStaCtx->gtkOffloadReqParams,
+ sizeof (tSirGtkOffloadParams));
+ status = sme_SetGTKOffload(hHal, &hddGtkOffloadReqParams,
pAdapter->sessionId);
if (eHAL_STATUS_SUCCESS != status)
@@ -7879,19 +7909,17 @@
__func__, status);
return status;
}
- pHddStaCtx->gtkOffloadRequestParams.requested = FALSE;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: sme_SetGTKOffload successfull", __func__);
}
else
{
- pHddStaCtx->gtkOffloadRequestParams.requested = TRUE;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: wlan not suspended GTKOffload request is stored",
__func__);
- return eHAL_STATUS_SUCCESS;
}
- return status;
+
+ return eHAL_STATUS_SUCCESS;
}
#endif /*WLAN_FEATURE_GTK_OFFLOAD*/
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index b3d9def..69e4682 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -860,9 +860,6 @@
hdd_enter_deep_sleep(pHddCtx, pAdapter);
}
#endif
- /* Suspend notification sent down to driver*/
- hdd_conf_suspend_ind(pHddCtx, pAdapter);
-
#ifdef WLAN_FEATURE_GTK_OFFLOAD
if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode))
@@ -870,29 +867,36 @@
eHalStatus ret;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
if ((eConnectionState_Associated == pHddStaCtx->conn_info.connState) &&
- (TRUE == pHddStaCtx->gtkOffloadRequestParams.requested))
+ (GTK_OFFLOAD_ENABLE == pHddStaCtx->gtkOffloadReqParams.ulFlags ))
{
+ tSirGtkOffloadParams hddGtkOffloadReqParams;
+ vos_mem_copy(&hddGtkOffloadReqParams,
+ &pHddStaCtx->gtkOffloadReqParams,
+ sizeof (tSirGtkOffloadParams));
+
ret = sme_SetGTKOffload(WLAN_HDD_GET_HAL_CTX(pAdapter),
- &pHddStaCtx->gtkOffloadRequestParams.gtkOffloadReqParams,
- pAdapter->sessionId);
+ &hddGtkOffloadReqParams, pAdapter->sessionId);
if (eHAL_STATUS_SUCCESS != ret)
{
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
"%s: sme_SetGTKOffload failed, returned %d",
__func__, ret);
}
- pHddStaCtx->gtkOffloadRequestParams.requested = FALSE;
+
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
- "%s: sme_SetGTKOffload successfull",
- __func__);
+ "%s: sme_SetGTKOffload successfull", __func__);
}
}
#endif
+
+ /*Suspend notification sent down to driver*/
+ hdd_conf_suspend_ind(pHddCtx, pAdapter);
+
status = hdd_get_next_adapter ( pHddCtx, pAdapterNode, &pNext );
pAdapterNode = pNext;
}
-
pHddCtx->hdd_wlan_suspended = TRUE;
+
#ifdef SUPPORT_EARLY_SUSPEND_STANDBY_DEEPSLEEP
if(pHddCtx->cfg_ini->nEnableSuspend == WLAN_MAP_SUSPEND_TO_STANDBY)
{
@@ -987,17 +991,15 @@
void wlan_hdd_update_and_dissable_gtk_offload(hdd_adapter_t *pAdapter)
{
eHalStatus ret;
- tpSirGtkOffloadParams pGtkOffloadReqParams;
+ tSirGtkOffloadParams hddGtkOffloadReqParams;
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
- pGtkOffloadReqParams =
- &pHddStaCtx->gtkOffloadRequestParams.gtkOffloadReqParams;
-
if ((eConnectionState_Associated == pHddStaCtx->conn_info.connState) &&
- (0 != memcmp(&pGtkOffloadReqParams->bssId,
+ (0 == memcmp(&pHddStaCtx->gtkOffloadReqParams.bssId,
&pHddStaCtx->conn_info.bssId, WNI_CFG_BSSID_LEN)) &&
- (FALSE == pHddStaCtx->gtkOffloadRequestParams.requested))
+ (GTK_OFFLOAD_ENABLE == pHddStaCtx->gtkOffloadReqParams.ulFlags))
{
+
/* Host driver has previously offloaded GTK rekey */
ret = sme_GetGTKOffload(WLAN_HDD_GET_HAL_CTX(pAdapter),
wlan_hdd_cfg80211_update_replayCounterCallback,
@@ -1012,9 +1014,11 @@
"%s: sme_GetGTKOffload successfull", __func__);
/* Sending GTK offload dissable */
- pGtkOffloadReqParams->ulFlags = GTK_OFFLOAD_DISABLE;
+ memcpy(&hddGtkOffloadReqParams, &pHddStaCtx->gtkOffloadReqParams,
+ sizeof (tSirGtkOffloadParams));
+ hddGtkOffloadReqParams.ulFlags = GTK_OFFLOAD_DISABLE;
ret = sme_SetGTKOffload(WLAN_HDD_GET_HAL_CTX(pAdapter),
- pGtkOffloadReqParams, pAdapter->sessionId);
+ &hddGtkOffloadReqParams, pAdapter->sessionId);
if (eHAL_STATUS_SUCCESS != ret)
{
@@ -1022,7 +1026,6 @@
"%s: failed to dissable GTK offload, returned %d",
__func__, ret);
}
- pHddStaCtx->gtkOffloadRequestParams.requested = FALSE;
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: successfully dissabled GTK offload request to HAL",
__func__);