commit 9edf957229a15dad34f2f1bc8c1d9b095a78bcbd
author Jeff Johnson <jjohnson@codeaurora.org> Mon Oct 03 15:24:49 2016 -0700
committer qcabuildsw <qcabuildsw@localhost> Thu Oct 06 08:14:38 2016 -0700
tree f912f403f2813f6ea26f4cdfdb5a615e7c26d6e2
parent 9eeed0aedb6958ed2c685ea826433929da4b7252

qcacld-3.0: Avoid eMib_dot11DesiredBssType in cfg80211

Currently in wlan_hdd_cfg80211.c wlan_hdd_try_disconnect() calls
hdd_conn_get_connected_bss_type() which returns a value of
eMib_dot11DesiredBssType.  This type is being deprecated so directly
use the adapter's device_mode.

Change-Id: Ib8981750475bd27818a0c7e4e386396869d90e69
CRs-Fixed: 1073739

core/hdd/src/wlan_hdd_cfg80211.c

diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 1da11ee..2e6c4af 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -12079,14 +12079,11 @@
 {
 	unsigned long rc;
 	hdd_station_ctx_t *pHddStaCtx;
-	eMib_dot11DesiredBssType connectedBssType;
 	int status, result = 0;
 
 	pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 
-	hdd_conn_get_connected_bss_type(pHddStaCtx, &connectedBssType);
-
-	if ((eMib_dot11DesiredBssType_independent == connectedBssType) ||
+	if ((QDF_IBSS_MODE == pAdapter->device_mode) ||
 	  (eConnectionState_Associated == pHddStaCtx->conn_info.connState) ||
 	  (eConnectionState_Connecting == pHddStaCtx->conn_info.connState) ||
 	  (eConnectionState_IbssConnected == pHddStaCtx->conn_info.connState)) {