wlan: add station and monitor mode concurrency
Currently sta interface cannot operate in parallel with monitor
interface, but, to monitor the traffic of access point to which sta is
connected, there is need of monitor interface operating in parallel and
on the same connected channel.
Therefore, add single channel concurrency for sta and monitor interfaces.
Change-Id: I5107e905d93a0e1b64077a3c189fa580f6fcab4d
CRs-Fixed: 2160352
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 6174878..61f5abd 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -5700,6 +5700,166 @@
return ret;
}
+static int
+wlan_hdd_sta_mon_op(hdd_context_t *hdd_ctx, uint32_t set_value,
+ hdd_adapter_t *mon_adapter, hdd_mon_ctx_t *mon_ctx)
+{
+ hdd_station_ctx_t *sta_ctx;
+ VOS_STATUS disable_bmps_status;
+ hdd_adapter_t *sta_adapter;
+ v_CONTEXT_t vos_ctx = (WLAN_HDD_GET_CTX(mon_adapter))->pvosContext;
+
+ if (!test_bit(DEVICE_IFACE_OPENED, &mon_adapter->event_flags)) {
+ hddLog(LOGE, FL("Monitor Interface is not OPENED"));
+ return -EINVAL;
+ }
+
+ if (set_value == MON_MODE_STOP) {
+ if (wlan_hdd_check_monitor_state(hdd_ctx))
+ return 0;
+ return -EINVAL;
+ }
+
+ sta_adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION);
+ if (!sta_adapter) {
+ hddLog(LOGE, FL("No Station adapter"));
+ return -EINVAL;
+ }
+
+ sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter);
+ if (!sta_ctx || !hdd_connIsConnected(sta_ctx)) {
+ hddLog(LOGE, FL("STA is not connected"));
+ return -EINVAL;
+ }
+
+ if (hdd_isConnectionInProgress(hdd_ctx, NULL, NULL)) {
+ hddLog(LOGE, FL("Roaming or set-key is in progress"));
+ return -EBUSY;
+ }
+
+ hdd_disable_roaming(hdd_ctx);
+
+ hddLog(LOG1, FL("Disable BMPS"));
+ disable_bmps_status = hdd_disable_bmps_imps(hdd_ctx,
+ WLAN_HDD_INFRA_STATION);
+ if (disable_bmps_status != VOS_STATUS_SUCCESS) {
+ hddLog(LOGE, FL("Cannot start monitor mode"));
+ hdd_restore_roaming(hdd_ctx);
+ return -EINVAL;
+ }
+
+ mon_ctx->ChannelNo = sta_ctx->conn_info.operationChannel;
+
+ /*
+ * In STA + Mon mode, firmware should not consider ChannelBW
+ */
+ mon_ctx->ChannelBW = 0;
+ mon_ctx->crcCheckEnabled = 0;
+ wlan_hdd_mon_set_typesubtype(mon_ctx, 100);
+ mon_ctx->is80211to803ConReq = 0;
+ WLANTL_SetIsConversionReq(vos_ctx, 0);
+ mon_adapter->dev->type = ARPHRD_IEEE80211_RADIOTAP;
+
+ mon_ctx->state = MON_MODE_START;
+ return 0;
+}
+
+/* set param sub-ioctls */
+static int __iw_mon_setint_getnone(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ hdd_adapter_t *adapter;
+ hdd_context_t *hdd_ctx;
+ hdd_mon_ctx_t *mon_ctx;
+ int *value = (int *)extra;
+ int sub_cmd = value[0];
+ int set_value = value[1];
+ int ret = 0; /* success */
+ tVOS_CONCURRENCY_MODE concurrency_mode;
+
+ ENTER();
+ adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+ if (!adapter || adapter->device_mode != WLAN_HDD_MONITOR)
+ return -EINVAL;
+
+ hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+ ret = wlan_hdd_validate_context(hdd_ctx);
+ if (ret)
+ return ret;
+
+ concurrency_mode = hdd_ctx->concurrency_mode;
+ if (concurrency_mode != VOS_STA_MON) {
+ hddLog(LOGE, "invalid concurrency mode %d", concurrency_mode);
+ return -EINVAL;
+ }
+
+ switch(sub_cmd) {
+
+ case WE_SET_MONITOR_STATE:
+ {
+ v_U32_t magic = 0;
+ struct completion cmp_var;
+ long waitRet = 0;
+
+ mon_ctx = WLAN_HDD_GET_MONITOR_CTX_PTR(adapter);
+ if(!mon_ctx) {
+ hddLog(LOGE, "Monitor Context NULL");
+ ret = -EIO;
+ break;
+ }
+
+ if (mon_ctx->state == set_value) {
+ hddLog(LOGE, FL("already in same mode curr_mode:%d req_mode: %d"),
+ mon_ctx->state, set_value);
+ break;
+ }
+
+ ret = wlan_hdd_sta_mon_op(hdd_ctx, set_value,
+ adapter,mon_ctx);
+ if (ret)
+ break;
+
+ mon_ctx->state = set_value;
+ magic = MON_MODE_MSG_MAGIC;
+ init_completion(&cmp_var);
+ if (wlan_hdd_mon_postMsg(&magic, &cmp_var, mon_ctx,
+ hdd_monPostMsgCb) != VOS_STATUS_SUCCESS) {
+ hddLog(LOGE, FL("failed to post MON MODE REQ"));
+ mon_ctx->state =
+ (mon_ctx->state==MON_MODE_START) ?
+ MON_MODE_STOP : MON_MODE_START;
+ magic = 0;
+ ret = -EIO;
+ break;
+ }
+
+ waitRet = wait_for_completion_timeout(&cmp_var,
+ MON_MODE_MSG_TIMEOUT);
+ magic = 0;
+ if (waitRet <= 0 ){
+ hddLog(LOGE, FL("failed to wait on monitor mode completion %ld"),
+ waitRet);
+ } else if (mon_ctx->state == MON_MODE_STOP) {
+ hddLog(LOG1, FL("Enable BMPS"));
+ hdd_enable_bmps_imps(hdd_ctx);
+ hdd_restore_roaming(hdd_ctx);
+ }
+ }
+ break;
+
+ default:
+ {
+ hddLog(LOGE, "Invalid IOCTL setvalue command %d value %d",
+ sub_cmd, set_value);
+ }
+ break;
+ }
+
+ EXIT();
+ return ret;
+}
+
/* set param sub-ioctls */
static int __iw_setint_getnone(struct net_device *dev,
struct iw_request_info *info,
@@ -5802,6 +5962,12 @@
}
case WE_SET_POWER:
{
+ if (wlan_hdd_check_monitor_state(pHddCtx)) {
+ hddLog(LOGE, FL("setPower not allowed in STA + MON"));
+ ret = -EOPNOTSUPP;
+ break;
+ }
+
switch (set_value)
{
case 0: //Full Power
@@ -6440,6 +6606,21 @@
return 0;
}
+
+static
+int iw_mon_setint_getnone(struct net_device *dev,
+ struct iw_request_info *info,
+ union iwreq_data *wrqu, char *extra)
+{
+ int ret;
+
+ vos_ssr_protect(__func__);
+ ret = __iw_mon_setint_getnone(dev, info, wrqu, extra);
+ vos_ssr_unprotect(__func__);
+
+ return 0;
+}
+
/* set param sub-ioctls */
static int __iw_setchar_getnone(struct net_device *dev,
struct iw_request_info *info,
@@ -6515,10 +6696,22 @@
switch(sub_cmd)
{
case WE_WOWL_ADD_PTRN:
+ if (wlan_hdd_check_monitor_state(pHddCtx)) {
+ hddLog(LOGE, FL("wowlAddPtrn not allowed in STA + MON"));
+ ret = -EOPNOTSUPP;
+ break;
+ }
+
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "ADD_PTRN");
hdd_add_wowl_ptrn(pAdapter, pBuffer);
break;
case WE_WOWL_DEL_PTRN:
+ if (wlan_hdd_check_monitor_state(pHddCtx)) {
+ hddLog(LOGE, FL("wowlDelPtrn not allowed in STA + MON"));
+ ret = -EOPNOTSUPP;
+ break;
+ }
+
VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, "DEL_PTRN");
hdd_del_wowl_ptrn(pAdapter, pBuffer);
break;
@@ -7593,6 +7786,12 @@
"adapter and try again\n");
break;
}
+
+ if (wlan_hdd_check_monitor_state(pHddCtx)) {
+ hddLog(LOGE, FL("initAP not allowed in STA + MON"));
+ ret = -EOPNOTSUPP;
+ break;
+ }
pr_info("Init AP trigger\n");
hdd_open_adapter( WLAN_HDD_GET_CTX(pAdapter), WLAN_HDD_SOFTAP, "softap.%d",
wlan_hdd_get_intf_addr( WLAN_HDD_GET_CTX(pAdapter) ),TRUE);
@@ -11176,6 +11375,20 @@
[WLAN_GET_LINK_SPEED - SIOCIWFIRSTPRIV] = iw_get_linkspeed_priv,
};
+static const iw_handler we_mon_private[] = {
+ [WLAN_PRIV_SET_INT_GET_NONE - SIOCIWFIRSTPRIV] =
+ iw_mon_setint_getnone,
+};
+
+static const struct iw_priv_args we_mon_private_args[] = {
+ {WE_SET_MONITOR_STATE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+ 0, "monitor"},
+
+ /* handlers for main ioctl */
+ {WLAN_PRIV_SET_INT_GET_NONE, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
+ 0, "" },
+};
+
/*Maximum command length can be only 15 */
static const struct iw_priv_args we_private_args[] = {
@@ -11785,6 +11998,17 @@
.get_wireless_stats = get_wireless_stats,
};
+const struct iw_handler_def we_mon_handler_def = {
+ .num_standard = 0,
+ .num_private = sizeof(we_mon_private) / sizeof(we_mon_private[0]),
+ .num_private_args =
+ sizeof(we_mon_private_args) / sizeof(we_mon_private_args[0]),
+ .standard = NULL,
+ .private = (iw_handler *)we_mon_private,
+ .private_args = we_mon_private_args,
+ .get_wireless_stats = NULL,
+};
+
int hdd_validate_mcc_config(hdd_adapter_t *pAdapter, v_UINT_t staId, v_UINT_t arg1, v_UINT_t arg2, v_UINT_t arg3)
{
v_U32_t cmd = 288; //Command to RIVA
@@ -12012,6 +12236,13 @@
ENTER();
+ if (pAdapter->device_mode == WLAN_HDD_MONITOR &&
+ hdd_get_conparam() != VOS_MONITOR_MODE) {
+ // Register as a wireless device
+ dev->wireless_handlers = (struct iw_handler_def *)&we_mon_handler_def;
+ return 0;
+ }
+
// Zero the memory. This zeros the profile structure.
memset(pwextBuf, 0,sizeof(hdd_wext_state_t));