Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a28a11c authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by Akash Patel
Browse files

qcacld-3.0: Remove obsolete and duplicate macros 

Remove obsolete and duplicate macros.

Change-Id: I19010da3b40af1e65ec9a9a5e1fc01ecac56b0df
CRs-Fixed: 898864
parent 78467a8d

core/hdd/inc/wlan_hdd_wext.h

+1 −7
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.

 *

 * Previously licensed under the ISC license by Qualcomm Atheros, Inc.

 *
@@ -143,12 +143,6 @@ typedef enum { 
/** Maximum Length of WPA/RSN IE */

#define MAX_WPA_RSN_IE_LEN 40



/** Maximum Number of WEP KEYS */

#define MAX_WEP_KEYS 4



/** Ether Address Length */

#define ETHER_ADDR_LEN 6



/** Enable 11d */

#define ENABLE_11D  1

core/hdd/src/wlan_hdd_assoc.c

+1 −1
Original line number Diff line number Diff line
@@ -4449,7 +4449,7 @@ static int32_t hdd_process_genie(hdd_adapter_t *pAdapter, 
			 * in the bssid.

			 */

			cdf_mem_copy(PMKIDCache[i].BSSID.bytes,

				     bssid, ETHER_ADDR_LEN);

				     bssid, CDF_MAC_ADDR_SIZE);

			cdf_mem_copy(PMKIDCache[i].PMKID,

				     dot11RSNIE.pmkid[i], CSR_RSN_PMKID_SIZE);

		}

core/hdd/src/wlan_hdd_cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -9871,7 +9871,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy, 
						mac,

						pAdapter->aStaInfo[i].

							macAddrSTA.bytes,

						ETHER_ADDR_LEN);

						CDF_MAC_ADDR_SIZE);

					if (hdd_ipa_uc_is_enabled(pHddCtx)) {

						hdd_ipa_wlan_evt(pAdapter,

							pAdapter->
@@ -10161,7 +10161,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy, 


	halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);



	cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, ETHER_ADDR_LEN);

	cdf_mem_copy(pmk_id.BSSID.bytes, pmksa->bssid, CDF_MAC_ADDR_SIZE);

	cdf_mem_copy(pmk_id.PMKID, pmksa->pmkid, CSR_RSN_PMKID_SIZE);



	/* Add to the PMKSA ID Cache in CSR */

core/mac/inc/sir_api.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#define SIR_MAX_SUPPORTED_CHANNEL_LIST      96



#define SIR_MDIE_ELEMENT_ID         54

#define SIR_MDIE_SIZE               3

#define SIR_MDIE_SIZE               3   /* MD ID(2 bytes), Capability(1 byte) */



/* Increase dwell time for P2P search in ms */

#define P2P_SEARCH_DWELL_TIME_INCREASE   20

core/mac/inc/sir_mac_prot_def.h

+2 −34
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.

 *

 * Previously licensed under the ISC license by Qualcomm Atheros, Inc.

 *
@@ -493,39 +493,7 @@ 
#define SIR_MAC_IPV6_ADDR_LEN               16

#define SIR_IPV6_ADDR_VALID                 1

#endif /* WLAN_NS_OFFLOAD */

#define SIR_MAC_ARP_OFFLOAD_SIZE        1



/* total length of an Info element including T/L fields */

#define EID_LEN(eid) (2 + (eid))



/* support for radar Detect, Channel Switch */

#define CHANNEL_SWITCH_MAX_FRAME_SIZE               256



/* Length of Channel Switch related message */

#define SIR_SME_CHANNEL_SWITCH_SIZE \

	(sizeof(uint8_t) + 2 * sizeof(uint16_t) + sizeof(uint32_t) +\

	sizeof(ePhyChanBondState))

#define SIR_CHANNEL_SWITCH_IE_SIZE         EID_LEN(SIR_MAC_CHNL_SWITCH_ANN_EID_MIN)



/* Measurement Request/Report messages */

#define SIR_MEAS_REQ_FIELD_SIZE                11

#define SIR_MEAS_REQ_IE_SIZE                   (5 + SIR_MEAS_REQ_FIELD_SIZE)

#define SIR_MEAS_REQ_ACTION_FRAME_SIZE         (3 + SIR_MEAS_REQ_IE_SIZE)

#define SIR_MEAS_MAX_FRAME_SIZE                256

#define SIR_MEAS_REPORT_MIN_FRAME_SIZE         (3 + EID_LEN(SIR_MAC_MEAS_RPT_EID_MIN))



#define SIR_MAC_SET_MEAS_REQ_ENABLE(x)         (((uint8_t) x) | 2)

#define SIR_MAC_SET_MEAS_REQ_REQUEST(x)        (((uint8_t) x) | 4)

#define SIR_MAC_SET_MEAS_REQ_REPORT(x)         (((uint8_t) x) | 8)



#define SIR_MAC_SET_MEAS_REPORT_LATE(x)        (((uint8_t) x) | 1)

#define SIR_MAC_SET_MEAS_REPORT_INCAPABLE(x)   (((uint8_t) x) | 2)

#define SIR_MAC_SET_MEAS_REPORT_REFUSE(x)      (((uint8_t) x) | 4)



/* Length of TPC Request Action Frame */

#define SIR_TPC_REQ_ACTION_FRAME_SIZE          (3 + EID_LEN(SIR_MAC_TPC_REQ_EID_MIN))

#define SIR_TPC_REPORT_ACTION_FRAME_SIZE       (3 + EID_LEN(SIR_MAC_TPC_RPT_EID_MIN))

#define SIR_TPC_MAX_FRAME_SIZE                 256



/* ----------------------------------------------------------------------------- */



/* OFFSET definitions for fixed fields in Management frames */