wlan: hdd: remove obsolete "CONFIG_CFG80211" featurization
cfg80211 interface support is must in newer version of Android
Therefore remove the conditional compilation since "CONFIG_CFG80211"
mode code must always be present.
Change-Id: I7683ba01302504871dc5f3cee0461fac7f7523e0
CRs-fixed: 459417
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index c9a2101..16dae45 100755
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -71,16 +71,12 @@
#include "wlan_nlink_common.h"
#include "wlan_btc_svc.h"
#include "wlan_hdd_power.h"
-#ifdef CONFIG_CFG80211
#include <linux/ieee80211.h>
#include <linux/wireless.h>
#include <net/cfg80211.h>
#include "wlan_hdd_cfg80211.h"
#include "csrInsideApi.h"
-#endif
-#if defined CONFIG_CFG80211
#include "wlan_hdd_p2p.h"
-#endif
#ifdef FEATURE_WLAN_TDLS
#include "wlan_hdd_tdls.h"
#endif
@@ -384,7 +380,7 @@
tANI_U32 ric_ies_length = 0;
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-#if defined(CONFIG_CFG80211) && defined (KERNEL_SUPPORT_11R_CFG80211)
+#if defined(KERNEL_SUPPORT_11R_CFG80211)
struct cfg80211_ft_event_params ftEvent;
v_U8_t ftIe[DOT11F_IE_FTINFO_MAX_LEN];
v_U8_t ricIe[DOT11F_IE_RICDESCRIPTOR_MAX_LEN];
@@ -395,7 +391,7 @@
tANI_U16 str_len;
#endif
-#if defined(CONFIG_CFG80211) && defined (KERNEL_SUPPORT_11R_CFG80211)
+#if defined(KERNEL_SUPPORT_11R_CFG80211)
vos_mem_zero(ftIe, DOT11F_IE_FTINFO_MAX_LEN);
vos_mem_zero(ricIe, DOT11F_IE_RICDESCRIPTOR_MAX_LEN);
@@ -756,7 +752,6 @@
// indicate 'disconnect' status to wpa_supplicant...
hdd_SendAssociationEvent(dev,pRoamInfo);
-#ifdef CONFIG_CFG80211
/* indicate disconnected event to nl80211 */
if(roamStatus != eCSR_ROAM_IBSS_LEAVE)
{
@@ -838,7 +833,6 @@
}
}
}
-#endif
//We should clear all sta register with TL, for now, only one.
@@ -1086,10 +1080,8 @@
hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
VOS_STATUS vosStatus;
-#ifdef CONFIG_CFG80211
v_U8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN];
tANI_U32 reqRsnLength = DOT11F_IE_RSN_MAX_LEN;
-#endif
#if defined (FEATURE_WLAN_CCX) || defined(FEATURE_WLAN_LFR) || defined (WLAN_FEATURE_VOWIFI_11R)
int ft_carrier_on = FALSE;
#endif
@@ -1166,7 +1158,6 @@
//If authentication is required (WPA/WPA2/DWEP), change TL to CONNECTED instead of AUTHENTICATED
if( !pRoamInfo->fReassocReq )
{
-#ifdef CONFIG_CFG80211
struct cfg80211_bss *bss;
#ifdef WLAN_FEATURE_VOWIFI_11R
u8 *pFTAssocRsp = NULL;
@@ -1288,7 +1279,6 @@
cfg80211_put_bss(bss);
}
}
-#endif
// Register the Station with TL after associated...
vosStatus = hdd_roamRegisterSTA( pAdapter,
pRoamInfo,
@@ -1399,7 +1389,6 @@
}
}
-#ifdef CONFIG_CFG80211
/* inform association failure event to nl80211 */
if(eCSR_ROAM_RESULT_ASSOC_FAIL_CON_CHANNEL == roamResult)
{
@@ -1415,7 +1404,6 @@
WLAN_STATUS_UNSPECIFIED_FAILURE,
GFP_KERNEL);
}
-#endif
/*Clear the roam profile*/
hdd_clearRoamProfileIe( pAdapter );
@@ -1575,12 +1563,10 @@
// Send the bssid address to the wext.
hdd_SendAssociationEvent(pAdapter->dev, pRoamInfo);
-#ifdef CONFIG_CFG80211
/* add bss_id to cfg80211 data base */
wlan_hdd_cfg80211_update_bss_db(pAdapter, pRoamInfo);
/* send ibss join indication to nl80211 */
cfg80211_ibss_joined(pAdapter->dev, &pRoamInfo->bssid[0], GFP_KERNEL);
-#endif
return( eHAL_STATUS_SUCCESS );
}
@@ -1672,7 +1658,6 @@
memset(&wreq, 0, sizeof(wreq));
wreq.data.length = sizeof(msg);
wireless_send_event(pAdapter->dev, IWEVMICHAELMICFAILURE, &wreq, (char *)&msg);
-#ifdef CONFIG_CFG80211
/* inform mic failure to nl80211 */
cfg80211_michael_mic_failure(pAdapter->dev,
pRoamInfo->u.pMICFailureInfo->taMacAddr,
@@ -1682,7 +1667,6 @@
pRoamInfo->u.pMICFailureInfo->keyId,
pRoamInfo->u.pMICFailureInfo->TSC,
GFP_KERNEL);
-#endif
}
@@ -2791,7 +2775,6 @@
return -EINVAL;
}
/** wpa_supplicant 0.8.x, wext driver uses */
-#ifdef CONFIG_CFG80211
/** when cfg80211 defined, wpa_supplicant wext driver uses
zero-length, null-string ssid for force disconnection.
after disconnection (if previously connected) and cleaning ssid,
@@ -2799,7 +2782,6 @@
if ( 0 == wrqu->essid.length ) {
return 0;
}
-#endif
status = hdd_wmm_get_uapsd_mask(pAdapter,
&pWextState->roamProfile.uapsd_mask);