Quellcode durchsuchen

qcacld-3.0: Remove obsolete connDot11DesiredBssType

All users of connDot11DesiredBssType have been converted to better
supported interfaces, so remove all traces of this field.

Change-Id: Iabfc4642a500587abd1f10d4fbc3f9e88f627a83
CRs-Fixed: 1073739
Jeff Johnson vor 8 Jahren
Ursprung
Commit
6716a4ad9e
2 geänderte Dateien mit 0 neuen und 42 gelöschten Zeilen
  1. 0 6
      core/hdd/inc/wlan_hdd_assoc.h
  2. 0 36
      core/hdd/src/wlan_hdd_assoc.c

+ 0 - 6
core/hdd/inc/wlan_hdd_assoc.h

@@ -34,7 +34,6 @@
  */
 
 /* Include files */
-#include <wlan_hdd_mib.h>
 #include <sme_api.h>
 #include <wlan_defs.h>
 #include "ol_txrx_ctrl_api.h"
@@ -149,10 +148,6 @@ struct hdd_conn_flag {
 /**
  * typedef connection_info_t - structure to store connection information
  * @connState: connection state of the NIC
- * @connDot11DesiredBssType: BSS type of the current connection.
- *		Comes from the MIB at the time the connect request is issued
- *		in combination with the BssDescription from the
- *		associated entity
  * @bssId: BSSID
  * @SSID: SSID Info
  * @staId: Station ID
@@ -182,7 +177,6 @@ struct hdd_conn_flag {
  */
 typedef struct connection_info_s {
 	eConnectionState connState;
-	eMib_dot11DesiredBssType connDot11DesiredBssType;
 	struct qdf_mac_addr bssId;
 	tCsrSSIDInfo SSID;
 	uint8_t staId[MAX_PEERS];

+ 0 - 36
core/hdd/src/wlan_hdd_assoc.c

@@ -276,38 +276,6 @@ hdd_conn_get_connected_cipher_algo(hdd_station_ctx_t *pHddStaCtx,
 	return fConnected;
 }
 
-/**
- * hdd_conn_save_connected_bss_type() - set connected bss type
- * @pHddStaCtx: pointer to global HDD Station context
- * @csr_roamBssType: bss type
- *
- * Return: none
- */
-static inline void
-hdd_conn_save_connected_bss_type(hdd_station_ctx_t *pHddStaCtx,
-				 eCsrRoamBssType csr_roamBssType)
-{
-	switch (csr_roamBssType) {
-	case eCSR_BSS_TYPE_INFRASTRUCTURE:
-		pHddStaCtx->conn_info.connDot11DesiredBssType =
-			eMib_dot11DesiredBssType_infrastructure;
-		break;
-
-	case eCSR_BSS_TYPE_IBSS:
-	case eCSR_BSS_TYPE_START_IBSS:
-		pHddStaCtx->conn_info.connDot11DesiredBssType =
-			eMib_dot11DesiredBssType_independent;
-		break;
-
-	/** We will never set the BssType to 'any' when attempting a connection
-	      so CSR should never send this back to us.*/
-	case eCSR_BSS_TYPE_ANY:
-	default:
-		QDF_ASSERT(0);
-		break;
-	}
-}
-
 /**
  * hdd_remove_beacon_filter() - remove beacon filter
  * @adapter: Pointer to the hdd adapter
@@ -920,8 +888,6 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo,
 		}
 		hdd_save_bss_info(pAdapter, pRoamInfo);
 	}
-	/* save the connected BssType */
-	hdd_conn_save_connected_bss_type(pHddStaCtx, eBssType);
 }
 
 /**
@@ -1444,8 +1410,6 @@ static void hdd_conn_remove_connect_info(hdd_station_ctx_t *pHddStaCtx)
 	qdf_mem_zero(&pHddStaCtx->conn_info.Keys, sizeof(tCsrKeys));
 	qdf_mem_zero(&pHddStaCtx->ibss_enc_key, sizeof(tCsrRoamSetKey));
 
-	/* Set not-connected state */
-	pHddStaCtx->conn_info.connDot11DesiredBssType = eCSR_BSS_TYPE_ANY;
 	pHddStaCtx->conn_info.proxyARPService = 0;
 
 	qdf_mem_zero(&pHddStaCtx->conn_info.SSID, sizeof(tCsrSSIDInfo));