diff --git a/core/hdd/src/wlan_hdd_hostapd_wext.c b/core/hdd/src/wlan_hdd_hostapd_wext.c index 793d0acea5a3..aa2154436782 100644 --- a/core/hdd/src/wlan_hdd_hostapd_wext.c +++ b/core/hdd/src/wlan_hdd_hostapd_wext.c @@ -55,8 +55,6 @@ #define RC_2_RATE_IDX_11AC(_rc) ((_rc) & 0xf) #define HT_RC_2_STREAMS_11AC(_rc) ((((_rc) & 0x30) >> 4) + 1) -#define SAP_24GHZ_CH_COUNT (14) - static int hdd_sap_get_chan_width(struct hdd_adapter *adapter, int *value) { struct sap_context *sap_ctx; diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h index 90d6d90c8242..e807720dabaa 100644 --- a/core/mac/inc/ani_global.h +++ b/core/mac/inc/ani_global.h @@ -107,10 +107,6 @@ static inline mac_handle_t MAC_HANDLE(struct mac_context *mac) /* vendor element ID */ #define IE_EID_VENDOR (221) /* 0xDD */ -#define IE_LEN_SIZE (1) -#define IE_EID_SIZE (1) -/* Minimum size of vendor IE = 3 bytes of oui_data + 1 byte of data */ -#define IE_VENDOR_OUI_SIZE (4) /** * enum log_event_type - Type of event initiating bug report diff --git a/core/mac/inc/sir_types.h b/core/mac/inc/sir_types.h index d1ad0faafd92..eec1a9b114c4 100644 --- a/core/mac/inc/sir_types.h +++ b/core/mac/inc/sir_types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2016,2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2016,2018-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -71,6 +71,4 @@ typedef struct opaque_hdd_handle *hdd_handle_t; #define HAL_NUM_ASSOC_STA 32 #define HAL_NUM_STA 41 -#define STACFG_MAX_TC 8 - #endif /* __SIR_TYPES_H */ diff --git a/core/mac/src/pe/include/lim_trace.h b/core/mac/src/pe/include/lim_trace.h index a7dd6d1d5543..df95acc8514b 100644 --- a/core/mac/src/pe/include/lim_trace.h +++ b/core/mac/src/pe/include/lim_trace.h @@ -36,7 +36,6 @@ #define LIM_TRACE_GET_SSN(data) (((data) >> 16) & 0xff) #define LIM_TRACE_GET_SUBTYPE(data) (data & 0xff) -#define LIM_TRACE_GET_DEFERRED(data) (data & 0x80000000) #define LIM_TRACE_GET_DEFRD_OR_DROPPED(data) (data & 0xc0000000) #define LIM_MSG_PROCESSED 0 diff --git a/core/mac/src/pe/lim/lim_admit_control.c b/core/mac/src/pe/lim/lim_admit_control.c index 1cb0f338cbe4..b910eb95a91e 100644 --- a/core/mac/src/pe/lim/lim_admit_control.c +++ b/core/mac/src/pe/lim/lim_admit_control.c @@ -34,9 +34,6 @@ #include "lim_types.h" #include "lim_admit_control.h" -#define ADMIT_CONTROL_LOGLEVEL LOGD -#define ADMIT_CONTROL_POLICY_LOGLEVEL LOGD - /* total available bandwidth in bps in each phy mode * these should be defined in hal or dph - replace these later */ diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c index b1df66442a79..d0e009d72404 100644 --- a/core/mac/src/pe/lim/lim_process_action_frame.c +++ b/core/mac/src/pe/lim/lim_process_action_frame.c @@ -52,15 +52,8 @@ #include #include "dot11f.h" -#define BA_DEFAULT_TX_BUFFER_SIZE 64 - static last_processed_msg rrm_link_action_frm; -/* Note: The test passes if the STAUT stops sending any frames, and no further - frames are transmitted on this channel by the station when the AP has sent - the last 6 beacons, with the channel switch information elements as seen - with the sniffer.*/ -#define SIR_CHANSW_TX_STOP_MAX_COUNT 6 /**----------------------------------------------------------------- \fn lim_stop_tx_and_switch_channel \brief Stops the transmission if channel switch mode is silent and diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c index 3019dc008a73..5e7c185d9d71 100644 --- a/core/mac/src/pe/lim/lim_process_tdls.c +++ b/core/mac/src/pe/lim/lim_process_tdls.c @@ -121,10 +121,7 @@ enum tdls_peer_capability { TDLS_PEER_WMM_CAP = 2 } e_tdls_peer_capability; -/* some local defines */ #define LINK_IDEN_ADDR_OFFSET(x) (&x.LinkIdentifier) -#define PTI_LINK_IDEN_OFFSET (5) -#define PTI_BUF_STATUS_OFFSET (25) /* TODO, Move this parameters to configuration */ #define PEER_PSM_SUPPORT (0) diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h index cabfbc596136..a34328770217 100644 --- a/core/wma/inc/wma.h +++ b/core/wma/inc/wma.h @@ -117,15 +117,12 @@ #define WMA_BCAST_MAC_ADDR (0xFF) #define WMA_MCAST_IPV4_MAC_ADDR (0x01) #define WMA_MCAST_IPV6_MAC_ADDR (0x33) -#define WMA_ICMP_PROTOCOL (0x01) -#define WMA_IS_EAPOL_GET_MIN_LEN 14 #define WMA_EAPOL_SUBTYPE_GET_MIN_LEN 21 #define WMA_EAPOL_INFO_GET_MIN_LEN 23 #define WMA_IS_DHCP_GET_MIN_LEN 38 #define WMA_DHCP_SUBTYPE_GET_MIN_LEN 0x11D #define WMA_DHCP_INFO_GET_MIN_LEN 50 -#define WMA_IS_ARP_GET_MIN_LEN 14 #define WMA_ARP_SUBTYPE_GET_MIN_LEN 22 #define WMA_IPV4_PROTO_GET_MIN_LEN 24 #define WMA_IPV4_PKT_INFO_GET_MIN_LEN 42 @@ -169,17 +166,11 @@ #define WMA_MIN_RF_CHAINS (1) #define WMA_MAX_NSS (2) -#define WMA_BCN_BUF_MAX_SIZE 512 #define WMA_NOA_IE_SIZE(num_desc) (2 + (13 * (num_desc))) #define WMA_MAX_NOA_DESCRIPTORS 4 #define WMA_TIM_SUPPORTED_PVB_LENGTH ((HAL_NUM_STA / 8) + 1) -#define WMA_WOW_PTRN_MASK_VALID 0xFF -#define WMA_NUM_BITS_IN_BYTE 8 - -#define WMA_AP_WOW_DEFAULT_PTRN_MAX 4 - #define WMA_BSS_STATUS_STARTED 0x1 #define WMA_BSS_STATUS_STOPPED 0x2 @@ -221,8 +212,6 @@ #define WMA_TX_Q_RECHECK_TIMER_WAIT 2 /* 2 ms */ #define WMA_MAX_NUM_ARGS 8 -#define WMA_SMPS_MASK_LOWER_16BITS 0xFF -#define WMA_SMPS_MASK_UPPER_3BITS 0x7 #define WMA_SMPS_PARAM_VALUE_S 29 /* @@ -242,12 +231,8 @@ #define WMI_CMDID_MAX (WMI_TXBF_CMDID + 1) #define WMA_NLO_FREQ_THRESH 1000 /* in MHz */ -#define WMA_SEC_TO_MSEC(sec) (sec * 1000) /* sec to msec */ #define WMA_MSEC_TO_USEC(msec) (msec * 1000) /* msec to usec */ -/* Default rssi threshold defined in CFG80211 */ -#define WMA_RSSI_THOLD_DEFAULT -300 - #define WMA_AUTH_REQ_RECV_WAKE_LOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED #define WMA_ASSOC_REQ_RECV_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED #define WMA_DEAUTH_RECV_WAKE_LOCK_DURATION WAKELOCK_DURATION_RECOMMENDED