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_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index f59eeb0..4a6ad59 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -421,24 +421,46 @@
},
};
+/* interface limits for sta + monitor SCC */
+static const struct ieee80211_iface_limit
+wlan_hdd_iface_sta_mon_limit[] = {
+ {
+ .max = 1,
+ .types = BIT(NL80211_IFTYPE_STATION),
+ },
+ {
+ .max = 1, /* Monitor interface */
+ .types = BIT(NL80211_IFTYPE_MONITOR),
+ },
+};
+
/* By default, only single channel concurrency is allowed */
static struct ieee80211_iface_combination
-wlan_hdd_iface_combination = {
- .limits = wlan_hdd_iface_limit,
- .num_different_channels = 1,
- /*
- * max = WLAN_MAX_INTERFACES ; JellyBean architecture creates wlan0
- * and p2p0 interfaces during driver init
- * Some vendors create separate interface for P2P operations.
- * wlan0: STA interface
- * p2p0: P2P Device interface, action frames goes
- * through this interface.
- * p2p-xx: P2P interface, After GO negotiation this interface is
- * created for p2p operations(GO/CLIENT interface).
- */
- .max_interfaces = WLAN_MAX_INTERFACES,
- .n_limits = ARRAY_SIZE(wlan_hdd_iface_limit),
- .beacon_int_infra_match = false,
+wlan_hdd_iface_combination[] = {
+ {
+ .limits = wlan_hdd_iface_limit,
+ .num_different_channels = 1,
+ /*
+ * max = WLAN_MAX_INTERFACES ; JellyBean architecture creates wlan0
+ * and p2p0 interfaces during driver init
+ * Some vendors create separate interface for P2P operations.
+ * wlan0: STA interface
+ * p2p0: P2P Device interface, action frames goes
+ * through this interface.
+ * p2p-xx: P2P interface, After GO negotiation this interface is
+ * created for p2p operations(GO/CLIENT interface).
+ */
+ .max_interfaces = WLAN_MAX_INTERFACES,
+ .n_limits = ARRAY_SIZE(wlan_hdd_iface_limit),
+ .beacon_int_infra_match = false,
+ },
+ {
+ .limits = wlan_hdd_iface_sta_mon_limit,
+ .num_different_channels = 1,
+ .max_interfaces = WLAN_STA_AND_MON_INTERFACES,
+ .n_limits = ARRAY_SIZE(wlan_hdd_iface_sta_mon_limit),
+ .beacon_int_infra_match = false,
+ }
};
#endif
@@ -8945,12 +8967,8 @@
| BIT(NL80211_IFTYPE_ADHOC)
| BIT(NL80211_IFTYPE_P2P_CLIENT)
| BIT(NL80211_IFTYPE_P2P_GO)
- | BIT(NL80211_IFTYPE_AP);
-
- if (VOS_MONITOR_MODE == hdd_get_conparam())
- {
- wiphy->interface_modes |= BIT(NL80211_IFTYPE_MONITOR);
- }
+ | BIT(NL80211_IFTYPE_AP)
+ | BIT(NL80211_IFTYPE_MONITOR);
if( pCfg->advertiseConcurrentOperation )
{
@@ -8958,14 +8976,14 @@
if( pCfg->enableMCC )
{
/* Currently, supports up to two channels */
- wlan_hdd_iface_combination.num_different_channels = 2;
+ wlan_hdd_iface_combination[0].num_different_channels = 2;
if( !pCfg->allowMCCGODiffBI )
- wlan_hdd_iface_combination.beacon_int_infra_match = true;
+ wlan_hdd_iface_combination[0].beacon_int_infra_match = true;
}
- wiphy->iface_combinations = &wlan_hdd_iface_combination;
- wiphy->n_iface_combinations = 1;
+ wiphy->iface_combinations = wlan_hdd_iface_combination;
+ wiphy->n_iface_combinations = ARRAY_SIZE(wlan_hdd_iface_combination);
#endif
}
@@ -11501,6 +11519,12 @@
__func__, hdd_device_modetoString(pAdapter->device_mode),
pAdapter->device_mode);
+ if (pHddCtx->concurrency_mode == VOS_STA_MON) {
+ hddLog(VOS_TRACE_LEVEL_FATAL,
+ "%s: STA + MON is in progress, cannot change interface",
+ __func__);
+ }
+
if (vos_max_concurrent_connections_reached()) {
hddLog(VOS_TRACE_LEVEL_INFO, FL("Reached max concurrent connections"));
return -EINVAL;
@@ -14350,6 +14374,11 @@
return -EOPNOTSUPP;
}
+ if (pAdapter->device_mode == WLAN_HDD_MONITOR) {
+ hddLog(LOGE, FL("Scan is not supported for monitor adapter"));
+ return -EOPNOTSUPP;
+ }
+
if (TRUE == pScanInfo->mScanPending)
{
if ( MAX_PENDING_LOG > pScanInfo->mScanPendingCounter++ )
@@ -16099,6 +16128,9 @@
return status;
}
+ if (wlan_hdd_check_and_stop_mon(pAdapter, true))
+ return -EINVAL;
+
status = wlan_hdd_reassoc_bssid_hint(pAdapter, req);
if (0 == status)
return status;
@@ -16266,6 +16298,8 @@
netif_tx_disable(pAdapter->dev);
netif_carrier_off(pAdapter->dev);
+ wlan_hdd_check_and_stop_mon(pAdapter, true);
+
/*issue disconnect*/
status = sme_RoamDisconnect( WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, reason);