wlan: Support for NProbes, Home away time and Reassoc
This change has support for NProbes, Scan home away
time and HDD/SME level change for reassoc command
Change-Id: I0c050b4e67ca806b405c68c04d6b99e951dc4c5f
CRs-Fixed: 481935
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index aea7846..bd044c8 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -198,6 +198,9 @@
static VOS_STATUS hdd_parse_send_action_frame_data(tANI_U8 *pValue, tANI_U8 *pTargetApBssid,
tANI_U8 *pChannel, tANI_U8 *pDwellTime,
tANI_U8 **pBuf, tANI_U8 *pBufLen);
+static VOS_STATUS hdd_parse_reassoc_command_data(tANI_U8 *pValue,
+ tANI_U8 *pTargetApBssid,
+ tANI_U8 *pChannel);
#endif
static int hdd_netdev_notifier_call(struct notifier_block * nb,
unsigned long state,
@@ -1579,6 +1582,179 @@
goto exit;
}
}
+ else if (strncmp(command, "SETSCANNPROBES", 14) == 0)
+ {
+ tANI_U8 *value = command;
+ tANI_U8 nProbes = CFG_ROAM_SCAN_N_PROBES_DEFAULT;
+
+ /* Move pointer to ahead of SETSCANNPROBES<delimiter> */
+ value = value + 15;
+ /* Convert the value from ascii to integer */
+ ret = kstrtou8(value, 10, &nProbes);
+ if (ret < 0)
+ {
+ /* If the input value is greater than max value of datatype, then also
+ kstrtou8 fails */
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: kstrtou8 failed range [%d - %d]", __func__,
+ CFG_ROAM_SCAN_N_PROBES_MIN,
+ CFG_ROAM_SCAN_N_PROBES_MAX);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ if ((nProbes < CFG_ROAM_SCAN_N_PROBES_MIN) ||
+ (nProbes > CFG_ROAM_SCAN_N_PROBES_MAX))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "NProbes value %d is out of range"
+ " (Min: %d Max: %d)", nProbes,
+ CFG_ROAM_SCAN_N_PROBES_MIN,
+ CFG_ROAM_SCAN_N_PROBES_MAX);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Received Command to Set nProbes = %d", __func__, nProbes);
+
+ pHddCtx->cfg_ini->nProbes = nProbes;
+ sme_UpdateRoamScanNProbes((tHalHandle)(pHddCtx->hHal), nProbes);
+ }
+ else if (strncmp(priv_data.buf, "GETSCANNPROBES", 14) == 0)
+ {
+ tANI_U8 val = sme_getRoamScanNProbes((tHalHandle)(pHddCtx->hHal));
+ char extra[32];
+ tANI_U8 len = 0;
+
+ len = snprintf(extra, sizeof(extra), "%s %d", command, val);
+ if (copy_to_user(priv_data.buf, &extra, len + 1))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: failed to copy data to user buffer", __func__);
+ ret = -EFAULT;
+ goto exit;
+ }
+ }
+ else if (strncmp(command, "SETSCANHOMEAWAYTIME", 19) == 0)
+ {
+ tANI_U8 *value = command;
+ tANI_U16 homeAwayTime = CFG_ROAM_SCAN_HOME_AWAY_TIME_DEFAULT;
+
+ /* Move pointer to ahead of SETSCANHOMEAWAYTIME<delimiter> */
+ /* input value is in units of msec */
+ value = value + 20;
+ /* Convert the value from ascii to integer */
+ ret = kstrtou16(value, 10, &homeAwayTime);
+ if (ret < 0)
+ {
+ /* If the input value is greater than max value of datatype, then also
+ kstrtou8 fails */
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: kstrtou8 failed range [%d - %d]", __func__,
+ CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN,
+ CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ /*Currently Home Away Time has a MIN value of 3.
+ * But, we sould allow the user to input Zero,
+ * since we are using the value of Zero to disable
+ * this and fallback to LFR1.5 behaviour.*/
+ if (0 != homeAwayTime)
+ if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) ||
+ (homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "homeAwayTime value %d is out of range"
+ " (Min: %d Max: %d)", homeAwayTime,
+ CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN,
+ CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
+ "%s: Received Command to Set scan away time = %d", __func__, homeAwayTime);
+
+ pHddCtx->cfg_ini->nRoamScanHomeAwayTime = homeAwayTime;
+ sme_UpdateRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal), homeAwayTime);
+ }
+ else if (strncmp(priv_data.buf, "GETSCANHOMEAWAYTIME", 19) == 0)
+ {
+ tANI_U16 val = sme_getRoamScanHomeAwayTime((tHalHandle)(pHddCtx->hHal));
+ char extra[32];
+ tANI_U8 len = 0;
+
+ len = snprintf(extra, sizeof(extra), "%s %d", command, val);
+ if (copy_to_user(priv_data.buf, &extra, len + 1))
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: failed to copy data to user buffer", __func__);
+ ret = -EFAULT;
+ goto exit;
+ }
+ }
+ else if (strncmp(command, "REASSOC", 7) == 0)
+ {
+ tANI_U8 *value = command;
+ tANI_U8 channel = 0;
+ tSirMacAddr targetApBssid;
+ eHalStatus status = eHAL_STATUS_SUCCESS;
+
+ hdd_station_ctx_t *pHddStaCtx = NULL;
+ tANI_BOOLEAN wesMode = eANI_BOOLEAN_FALSE;
+ pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
+
+ wesMode = sme_GetWESMode((tHalHandle)(pHddCtx->hHal));
+
+ /* Reassoc command is allowed only if WES mode is enabled */
+ if (!wesMode)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s:WES Mode is not enabled(%d)",__func__, wesMode);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ /* if not associated, no need to proceed with reassoc */
+ if (eConnectionState_Associated != pHddStaCtx->conn_info.connState)
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s:Not associated!",__func__);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ status = hdd_parse_reassoc_command_data(value, targetApBssid, &channel);
+ if (eHAL_STATUS_SUCCESS != status)
+ {
+ VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+ "%s: Failed to parse reassoc command data", __func__);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ /* if the target bssid is same as currently associated AP,
+ then no need to proceed with reassoc */
+ if (VOS_TRUE == vos_mem_compare(targetApBssid,
+ pHddStaCtx->conn_info.bssId, sizeof(tSirMacAddr)))
+ {
+ VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "%s:Reassoc BSSID is same as currently associated AP bssid",__func__);
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ /* Check channel number is a valid channel number */
+ if(VOS_STATUS_SUCCESS !=
+ wlan_hdd_validate_operation_channel(pAdapter, channel))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid Channel [%d] \n", __func__, channel);
+ return -EINVAL;
+ }
+
+ /* Proceed with reassoc */
+ }
#endif
#ifdef FEATURE_WLAN_LFR
else if (strncmp(command, "SETFASTROAM", 11) == 0)
@@ -1972,7 +2148,6 @@
return VOS_STATUS_SUCCESS;
}
-#endif
/**---------------------------------------------------------------------------
\brief hdd_parse_countryrev() - HDD Parse country code revision
@@ -2170,6 +2345,84 @@
return VOS_STATUS_SUCCESS;
}
+
+/**---------------------------------------------------------------------------
+
+ \brief hdd_parse_reassoc_command_data() - HDD Parse reassoc command data
+
+ This function parses the reasoc command data passed in the format
+ REASSOC<space><bssid><space><channel>
+
+ \param - pValue Pointer to input country code revision
+ \param - pTargetApBssid Pointer to target Ap bssid
+ \param - pChannel Pointer to the Target AP channel
+
+ \return - 0 for success non-zero for failure
+
+ --------------------------------------------------------------------------*/
+VOS_STATUS hdd_parse_reassoc_command_data(tANI_U8 *pValue, tANI_U8 *pTargetApBssid, tANI_U8 *pChannel)
+{
+ tANI_U8 *inPtr = pValue;
+ int tempInt;
+ int v = 0;
+ tANI_U8 tempBuf[32];
+
+ inPtr = strnchr(pValue, strlen(pValue), SPACE_ASCII_VALUE);
+ /*no argument after the command*/
+ if (NULL == inPtr)
+ {
+ return -EINVAL;
+ }
+
+ /*no space after the command*/
+ else if (SPACE_ASCII_VALUE != *inPtr)
+ {
+ return -EINVAL;
+ }
+
+ /*removing empty spaces*/
+ while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr) ) inPtr++;
+
+ /*no argument followed by spaces*/
+ if ('\0' == *inPtr)
+ {
+ return -EINVAL;
+ }
+
+ /*getting the first argument ie the target AP bssid */
+ if (inPtr[2] != ':' || inPtr[5] != ':' || inPtr[8] != ':' || inPtr[11] != ':' || inPtr[14] != ':')
+ {
+ return -EINVAL;
+ }
+ sscanf(inPtr, "%2x:%2x:%2x:%2x:%2x:%2x", (unsigned int *)&pTargetApBssid[0], (unsigned int *)&pTargetApBssid[1],
+ (unsigned int *)&pTargetApBssid[2], (unsigned int *)&pTargetApBssid[3],
+ (unsigned int *)&pTargetApBssid[4], (unsigned int *)&pTargetApBssid[5]);
+
+ /* point to the next argument */
+ inPtr = strnchr(inPtr, strlen(inPtr), SPACE_ASCII_VALUE);
+ /*no argument after the command*/
+ if (NULL == inPtr) return -EINVAL;
+
+ /*removing empty spaces*/
+ while ((SPACE_ASCII_VALUE == *inPtr) && ('\0' != *inPtr) ) inPtr++;
+
+ /*no argument followed by spaces*/
+ if ('\0' == *inPtr)
+ {
+ return -EINVAL;
+ }
+
+ /*getting the next argument ie the channel number */
+ sscanf(inPtr, "%s ", tempBuf);
+ v = kstrtos32(tempBuf, 10, &tempInt);
+ if ( v < 0) return -EINVAL;
+
+ *pChannel = tempInt;
+ return VOS_STATUS_SUCCESS;
+}
+
+#endif
+
/**---------------------------------------------------------------------------
\brief hdd_open() - HDD Open function