wlan: hdd: remove obsolete "WLAN_FEATURE_P2P" featurization
The current driver has evolved over time from a driver that originally
only supported "station" mode. When the initial support for "P2P"
mode was added, the code was added with conditional compilation so
that the "P2P" feature could be included or excluded based upon
the target needs. Now, however, there is an expectation that all
drivers will support both "station" mode and "P2P" mode.
Therefore remove the conditional compilation since "P2P" mode code
must always be present.
Change-Id: I4886a44636a58cd33ea6b6dcdadc268c5b82dcc1
CRs-fixed: 459417
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index c174c9a..2b99eb3 100755
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -185,14 +185,12 @@
HDD2GHZCHAN(2484, 14, 0) ,
};
-#ifdef WLAN_FEATURE_P2P
static struct ieee80211_channel hdd_social_channels_2_4_GHZ[] =
{
HDD2GHZCHAN(2412, 1, 0) ,
HDD2GHZCHAN(2437, 6, 0) ,
HDD2GHZCHAN(2462, 11, 0) ,
};
-#endif
static struct ieee80211_channel hdd_channels_5_GHZ[] =
{
@@ -276,7 +274,6 @@
.ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED,
};
-#ifdef WLAN_FEATURE_P2P
static struct ieee80211_supported_band wlan_hdd_band_p2p_2_4_GHZ =
{
.channels = hdd_social_channels_2_4_GHZ,
@@ -295,7 +292,6 @@
.ht_cap.mcs.rx_highest = cpu_to_le16( 72 ),
.ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED,
};
-#endif
static struct ieee80211_supported_band wlan_hdd_band_5_GHZ =
{
@@ -337,7 +333,6 @@
BIT(SIR_MAC_MGMT_DEAUTH) |
BIT(SIR_MAC_MGMT_ACTION),
},
-#ifdef WLAN_FEATURE_P2P
[NL80211_IFTYPE_P2P_CLIENT] = {
.tx = 0xffff,
.rx = BIT(SIR_MAC_MGMT_ACTION) |
@@ -354,11 +349,9 @@
BIT(SIR_MAC_MGMT_DEAUTH) |
BIT(SIR_MAC_MGMT_ACTION),
},
-#endif
};
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-#ifdef WLAN_FEATURE_P2P
static const struct ieee80211_iface_limit
wlan_hdd_iface_limit[] = {
{
@@ -414,7 +407,6 @@
.beacon_int_infra_match = false,
};
#endif
-#endif
static struct cfg80211_ops wlan_hdd_cfg80211_ops;
@@ -514,11 +506,7 @@
wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
break;
case eCSR_BAND_5G:
-#ifdef WLAN_FEATURE_P2P
wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_p2p_2_4_GHZ;
-#else
- wiphy->bands[IEEE80211_BAND_2GHZ] = NULL;
-#endif
wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
break;
case eCSR_BAND_ALL:
@@ -576,14 +564,11 @@
/* Supports STATION & AD-HOC modes right now */
wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION)
| BIT(NL80211_IFTYPE_ADHOC)
-#ifdef WLAN_FEATURE_P2P
| BIT(NL80211_IFTYPE_P2P_CLIENT)
| BIT(NL80211_IFTYPE_P2P_GO)
-#endif
| BIT(NL80211_IFTYPE_AP);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
-#ifdef WLAN_FEATURE_P2P
if( pCfg->enableMCC )
{
/* Currently, supports up to two channels */
@@ -596,7 +581,6 @@
wiphy->iface_combinations = &wlan_hdd_iface_combination;
wiphy->n_iface_combinations = 1;
#endif
-#endif
/* Before registering we need to update the ht capabilitied based
* on ini values*/
@@ -624,9 +608,7 @@
wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_2_4_GHZ;
break;
case eCSR_BAND_5G:
-#ifdef WLAN_FEATURE_P2P
wiphy->bands[IEEE80211_BAND_2GHZ] = &wlan_hdd_band_p2p_2_4_GHZ;
-#endif
wiphy->bands[IEEE80211_BAND_5GHZ] = &wlan_hdd_band_5_GHZ;
break;
case eCSR_BAND_ALL:
@@ -642,10 +624,8 @@
wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
-#ifdef WLAN_FEATURE_P2P
wiphy->max_remain_on_channel_duration = 1000;
#endif
-#endif
/* Register our wiphy dev with cfg80211 */
if (0 > wiphy_register(wiphy))
@@ -685,7 +665,6 @@
*/
void wlan_hdd_cfg80211_post_voss_start(hdd_adapter_t* pAdapter)
{
-#ifdef WLAN_FEATURE_P2P
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
/* Register for all P2P action, public action etc frames */
v_U16_t type = (SIR_MAC_MGMT_FRAME << 2) | ( SIR_MAC_MGMT_ACTION << 4);
@@ -720,12 +699,10 @@
sme_RegisterMgmtFrame(hHal, pAdapter->sessionId, type,
(v_U8_t*)P2P_ACTION_FRAME,
P2P_ACTION_FRAME_SIZE );
-#endif /* WLAN_FEATURE_P2P */
}
void wlan_hdd_cfg80211_pre_voss_stop(hdd_adapter_t* pAdapter)
{
-#ifdef WLAN_FEATURE_P2P
tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pAdapter);
/* Register for all P2P action, public action etc frames */
v_U16_t type = (SIR_MAC_MGMT_FRAME << 2) | ( SIR_MAC_MGMT_ACTION << 4);
@@ -761,7 +738,6 @@
sme_DeregisterMgmtFrame(hHal, pAdapter->sessionId, type,
(v_U8_t*)P2P_ACTION_FRAME,
P2P_ACTION_FRAME_SIZE );
-#endif /* WLAN_FEATURE_P2P */
}
#ifdef FEATURE_WLAN_WAPI
@@ -1088,7 +1064,6 @@
}
#endif
-#ifdef WLAN_FEATURE_P2P
pIe = wlan_hdd_get_p2p_ie_ptr(pBeacon->tail,pBeacon->tail_len);
if(pIe)
@@ -1107,7 +1082,6 @@
}
total_ielen += ielen;
}
-#endif
if (ccmCfgSetStr((WLAN_HDD_GET_CTX(pHostapdAdapter))->hHal,
WNI_CFG_PROBE_RSP_BCN_ADDNIE_DATA, genie, total_ielen, NULL,
@@ -1414,11 +1388,8 @@
num_ch = WNI_CFG_VALID_CHANNEL_LIST_LEN;
- if ((WLAN_HDD_SOFTAP != pAdapter->device_mode)
-#ifdef WLAN_FEATURE_P2P
- && (WLAN_HDD_P2P_GO != pAdapter->device_mode)
-#endif
- )
+ if ((WLAN_HDD_SOFTAP != pAdapter->device_mode) &&
+ (WLAN_HDD_P2P_GO != pAdapter->device_mode))
{
if(VOS_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pAdapter,channel))
{
@@ -1431,9 +1402,7 @@
__func__, channel,pAdapter->device_mode);
}
if( (pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)
-#endif
)
{
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -1454,9 +1423,7 @@
&pHddStaCtx->conn_info.operationChannel;
}
else if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
(WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->sapConfig.channel = channel;
@@ -2002,9 +1969,7 @@
}
if ( (pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
beacon_data_t *old,*new;
@@ -2052,9 +2017,7 @@
}
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
beacon_data_t *old,*new;
@@ -2163,9 +2126,7 @@
}
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
beacon_data_t *old;
@@ -2299,9 +2260,7 @@
__func__, pAdapter->device_mode);
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
beacon_data_t *old, *new;
@@ -2350,9 +2309,7 @@
}
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
beacon_data_t *old,*new;
@@ -2394,9 +2351,7 @@
__func__,pAdapter->device_mode);
if((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
/* ap_isolate == -1 means that in change bss, upper layer doesn't
@@ -2467,10 +2422,8 @@
wlan_hdd_clear_concurrency_mode(pHddCtx, pAdapter->device_mode);
if( (pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)
|| (pAdapter->device_mode == WLAN_HDD_P2P_DEVICE)
-#endif
)
{
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -2480,9 +2433,7 @@
switch (type)
{
case NL80211_IFTYPE_STATION:
-#ifdef WLAN_FEATURE_P2P
case NL80211_IFTYPE_P2P_CLIENT:
-#endif
hddLog(VOS_TRACE_LEVEL_INFO,
"%s: setting interface Type to INFRASTRUCTURE", __func__);
pRoamProfile->BSSType = eCSR_BSS_TYPE_INFRASTRUCTURE;
@@ -2495,7 +2446,6 @@
pRoamProfile->phyMode =
hdd_cfg_xlate_to_csr_phy_mode(pConfig->dot11Mode);
wdev->iftype = type;
-#ifdef WLAN_FEATURE_P2P
//Check for sub-string p2p to confirm its a p2p interface
if (NULL != strstr(ndev->name,"p2p"))
{
@@ -2507,7 +2457,6 @@
pAdapter->device_mode = (type == NL80211_IFTYPE_STATION) ?
WLAN_HDD_INFRA_STATION: WLAN_HDD_P2P_CLIENT;
}
-#endif
break;
case NL80211_IFTYPE_ADHOC:
hddLog(VOS_TRACE_LEVEL_INFO,
@@ -2519,9 +2468,7 @@
break;
case NL80211_IFTYPE_AP:
-#ifdef WLAN_FEATURE_P2P
case NL80211_IFTYPE_P2P_GO:
-#endif
{
hddLog(VOS_TRACE_LEVEL_INFO_HIGH,
"%s: setting interface Type to %s", __func__,
@@ -2556,12 +2503,8 @@
hdd_stop_adapter( pHddCtx, pAdapter );
hdd_deinit_adapter( pHddCtx, pAdapter );
memset(&pAdapter->sessionCtx, 0, sizeof(pAdapter->sessionCtx));
-#ifdef WLAN_FEATURE_P2P
pAdapter->device_mode = (type == NL80211_IFTYPE_AP) ?
WLAN_HDD_SOFTAP : WLAN_HDD_P2P_GO;
-#else
- pAdapter->device_mode = WLAN_HDD_SOFTAP;
-#endif
//Disable BMPS and IMPS if enabled
//before starting Go
@@ -2630,22 +2573,17 @@
}
}
else if ( (pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
switch(type)
{
case NL80211_IFTYPE_STATION:
-#ifdef WLAN_FEATURE_P2P
case NL80211_IFTYPE_P2P_CLIENT:
-#endif
case NL80211_IFTYPE_ADHOC:
hdd_stop_adapter( pHddCtx, pAdapter );
hdd_deinit_adapter( pHddCtx, pAdapter );
wdev->iftype = type;
-#ifdef WLAN_FEATURE_P2P
//Check for sub-string p2p to confirm its a p2p interface
if (NULL != strstr(ndev->name,"p2p"))
{
@@ -2657,7 +2595,6 @@
pAdapter->device_mode = (type == NL80211_IFTYPE_STATION) ?
WLAN_HDD_INFRA_STATION: WLAN_HDD_P2P_CLIENT;
}
-#endif
hdd_set_conparam(0);
pHddCtx->change_iface = type;
memset(&pAdapter->sessionCtx, 0, sizeof(pAdapter->sessionCtx));
@@ -2671,14 +2608,10 @@
hdd_enable_bmps_imps(pHddCtx);
goto done;
case NL80211_IFTYPE_AP:
-#ifdef WLAN_FEATURE_P2P
case NL80211_IFTYPE_P2P_GO:
-#endif
wdev->iftype = type;
-#ifdef WLAN_FEATURE_P2P
pAdapter->device_mode = (type == NL80211_IFTYPE_AP) ?
WLAN_HDD_SOFTAP : WLAN_HDD_P2P_GO;
-#endif
goto done;
default:
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Unsupported interface Type",
@@ -2758,9 +2691,7 @@
vos_mem_copy(STAMacAddress.bytes, mac, sizeof(v_MACADDR_t));
if ( ( pAdapter->device_mode == WLAN_HDD_SOFTAP )
-#ifdef WLAN_FEATURE_P2P
|| ( pAdapter->device_mode == WLAN_HDD_P2P_GO )
-#endif
)
{
if(params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))
@@ -2937,9 +2868,7 @@
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
@@ -2998,9 +2927,7 @@
}
}
else if ( (pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)
-#endif
)
{
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
@@ -3339,9 +3266,7 @@
setKey.encType = eCSR_ENCRYPT_TYPE_NONE;
if ((pAdapter->device_mode == WLAN_HDD_SOFTAP)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_GO)
-#endif
)
{
@@ -3360,9 +3285,7 @@
}
}
else if ( (pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)
-#endif
)
{
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
@@ -3436,9 +3359,7 @@
}
if ((pAdapter->device_mode == WLAN_HDD_INFRA_STATION)
-#ifdef WLAN_FEATURE_P2P
|| (pAdapter->device_mode == WLAN_HDD_P2P_CLIENT)
-#endif
)
{
if ( (key_index != pWextState->roamProfile.Keys.defaultIndex) &&
@@ -4117,9 +4038,7 @@
v_U32_t scanId = 0;
int status = 0;
hdd_scaninfo_t *pScanInfo = &pHddCtx->scan_info;
-#ifdef WLAN_FEATURE_P2P
v_U8_t* pP2pIe = NULL;
-#endif
ENTER();
@@ -4341,7 +4260,6 @@
scanRequest.uIEFieldLen = pScanInfo->scanAddIE.length;
scanRequest.pIEField = pScanInfo->scanAddIE.addIEdata;
-#ifdef WLAN_FEATURE_P2P
pP2pIe = wlan_hdd_get_p2p_ie_ptr((v_U8_t*)request->ie,
request->ie_len);
if (pP2pIe != NULL)
@@ -4396,7 +4314,6 @@
}
}
-#endif
}
}
@@ -4917,7 +4834,6 @@
pWextState->roamProfile.pWPAReqIE = pWextState->WPARSNIE;
pWextState->roamProfile.nWPAReqIELength = eLen + 2;//ie_len;
}
-#ifdef WLAN_FEATURE_P2P
else if ( (0 == memcmp(&genie[0], P2P_OUI_TYPE,
P2P_OUI_TYPE_SIZE))
/*Consider P2P IE, only for P2P Client */
@@ -4941,7 +4857,6 @@
pWextState->roamProfile.pAddIEAssoc = pWextState->assocAddIE.addIEdata;
pWextState->roamProfile.nAddIEAssocLength = pWextState->assocAddIE.length;
}
-#endif
#ifdef WLAN_FEATURE_WFD
else if ( (0 == memcmp(&genie[0], WFD_OUI_TYPE,
WFD_OUI_TYPE_SIZE))
@@ -6281,9 +6196,7 @@
}
if ( (WLAN_HDD_SOFTAP == pAdapter->device_mode)
-#ifdef WLAN_FEATURE_P2P
|| (WLAN_HDD_P2P_GO == pAdapter->device_mode)
-#endif
)
{
if( NULL == mac )
@@ -6946,7 +6859,6 @@
.set_wiphy_params = wlan_hdd_cfg80211_set_wiphy_params,
.set_tx_power = wlan_hdd_cfg80211_set_txpower,
.get_tx_power = wlan_hdd_cfg80211_get_txpower,
-#ifdef WLAN_FEATURE_P2P
.remain_on_channel = wlan_hdd_cfg80211_remain_on_channel,
.cancel_remain_on_channel = wlan_hdd_cfg80211_cancel_remain_on_channel,
.mgmt_tx = wlan_hdd_action,
@@ -6955,7 +6867,6 @@
.set_default_mgmt_key = wlan_hdd_set_default_mgmt_key,
.set_txq_params = wlan_hdd_set_txq_params,
#endif
-#endif
.get_station = wlan_hdd_cfg80211_get_station,
.set_power_mgmt = wlan_hdd_cfg80211_set_power_mgmt,
.del_station = wlan_hdd_cfg80211_del_station,