From a248d0d7a26191229ed5158f4e29cbc09563d68a Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Tue, 8 Dec 2015 15:18:26 -0800 Subject: [PATCH] qcacld-3.0: Remove obsolete macros and functions Remove obsolete macros and functions. Change-Id: I18e3ba1ec3a38a0f1dfa2de70955f0af02bef37f CRs-Fixed: 898864 --- core/hdd/inc/wlan_hdd_host_offload.h | 6 +++--- core/hdd/inc/wlan_hdd_p2p.h | 11 ----------- core/hdd/inc/wlan_hdd_power.h | 12 ------------ core/hdd/inc/wlan_hdd_tdls.h | 14 -------------- core/hdd/inc/wlan_hdd_tx_rx.h | 17 ----------------- core/hdd/src/wlan_hdd_cfg80211.c | 2 -- core/hdd/src/wlan_hdd_power.c | 3 ++- core/hdd/src/wlan_hdd_wmm.c | 4 ---- core/mac/inc/sir_api.h | 9 +++------ core/mac/src/pe/lim/lim_utils.c | 4 ---- core/sme/inc/csr_internal.h | 7 ------- core/sme/inc/csr_support.h | 4 ---- core/sme/inc/sme_api.h | 2 -- core/sme/src/common/sme_api.c | 2 -- core/sme/src/csr/csr_util.c | 21 --------------------- core/sme/src/oem_data/oem_data_api.c | 8 +++----- 16 files changed, 11 insertions(+), 115 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_host_offload.h b/core/hdd/inc/wlan_hdd_host_offload.h index 515a8285510a..e0b4b4e99cb3 100644 --- a/core/hdd/inc/wlan_hdd_host_offload.h +++ b/core/hdd/inc/wlan_hdd_host_offload.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -51,8 +51,8 @@ typedef struct { uint8_t offloadType; uint8_t enableOrDisable; union { - uint8_t hostIpv4Addr[4]; - uint8_t hostIpv6Addr[16]; + uint8_t hostIpv4Addr[SIR_IPV4_ADDR_LEN]; + uint8_t hostIpv6Addr[SIR_MAC_IPV6_ADDR_LEN]; } params; struct cdf_mac_addr bssId; } tHostOffloadRequest, *tpHostOffloadRequest; diff --git a/core/hdd/inc/wlan_hdd_p2p.h b/core/hdd/inc/wlan_hdd_p2p.h index b9ef3445f627..baf2e4bcbbfb 100644 --- a/core/hdd/inc/wlan_hdd_p2p.h +++ b/core/hdd/inc/wlan_hdd_p2p.h @@ -38,7 +38,6 @@ #define WAIT_CANCEL_REM_CHAN 1000 #define WAIT_REM_CHAN_READY 1000 #define WAIT_CHANGE_CHANNEL_FOR_OFFCHANNEL_TX 3000 -#define ESTIMATED_ROC_DUR_REQD_FOR_ACTION_TX 20 #define COMPLETE_EVENT_PROPOGATE_TIME 10 #ifdef QCA_WIFI_3_0_EMU @@ -61,19 +60,9 @@ #define P2P_ROC_DURATION_MULTIPLIER_GO_ABSENT 5 #endif -#ifdef WLAN_FEATURE_11W -#define WLAN_HDD_SET_WEP_FRM_FC(__fc__) ((__fc__) = ((__fc__) | 0x40)) -#endif /* WLAN_FEATURE_11W */ - #define HDD_P2P_MAX_ROC_DURATION 1000 #define MAX_ROC_REQ_QUEUE_ENTRY 10 -enum hdd_rx_flags { - HDD_RX_FLAG_DECRYPTED = 1 << 0, - HDD_RX_FLAG_MMIC_STRIPPED = 1 << 1, - HDD_RX_FLAG_IV_STRIPPED = 1 << 2, -}; - #define P2P_POWER_SAVE_TYPE_OPPORTUNISTIC (1 << 0) #define P2P_POWER_SAVE_TYPE_PERIODIC_NOA (1 << 1) #define P2P_POWER_SAVE_TYPE_SINGLE_NOA (1 << 2) diff --git a/core/hdd/inc/wlan_hdd_power.h b/core/hdd/inc/wlan_hdd_power.h index c6157f037516..d32a2345f37c 100644 --- a/core/hdd/inc/wlan_hdd_power.h +++ b/core/hdd/inc/wlan_hdd_power.h @@ -39,18 +39,6 @@ #ifdef WLAN_FEATURE_PACKET_FILTERING #define HDD_MAX_CMP_PER_PACKET_FILTER 5 -#define HDD_FILTER_IPV6_MC_UC 1 -#define HDD_FILTER_IPV6_MC 0 -#define HDD_FILTER_ID_IPV6_MC 10 -#define HDD_FILTER_ID_IPV6_UC 11 - -#define HDD_IPV6_MC_CMP_DATA 0x33 -#define HDD_IPV6_UC_CMP_DATA 0x01 -#define HDD_IPV6_CMP_DATA_0 0x86 -#define HDD_IPV6_CMP_DATA_1 0xDD - -#define HDD_WLAN_MAC_ADDR_LEN 6 -#define HDD_MAX_NUM_MULTICAST_ADDRESS 10 /** * enum pkt_filter_protocol_layer - packet filter protocol layer diff --git a/core/hdd/inc/wlan_hdd_tdls.h b/core/hdd/inc/wlan_hdd_tdls.h index 801857c32176..6c0e41d09272 100644 --- a/core/hdd/inc/wlan_hdd_tdls.h +++ b/core/hdd/inc/wlan_hdd_tdls.h @@ -34,20 +34,6 @@ #ifdef FEATURE_WLAN_TDLS -#define TDLS_SUB_DISCOVERY_PERIOD 100 - -#define TDLS_MAX_DISCOVER_REQS_PER_TIMER 1 - -#define TDLS_DISCOVERY_PERIOD 3600000 - -#define TDLS_TX_STATS_PERIOD 3600000 - -#define TDLS_IMPLICIT_TRIGGER_PKT_THRESHOLD 100 - -#define TDLS_RX_IDLE_TIMEOUT 5000 - -#define TDLS_RSSI_TRIGGER_HYSTERESIS 50 - /* * Before UpdateTimer expires, we want to timeout discovery response * should not be more than 2000. diff --git a/core/hdd/inc/wlan_hdd_tx_rx.h b/core/hdd/inc/wlan_hdd_tx_rx.h index b4b29cca5adf..fc80851a1430 100644 --- a/core/hdd/inc/wlan_hdd_tx_rx.h +++ b/core/hdd/inc/wlan_hdd_tx_rx.h @@ -42,25 +42,10 @@ #define HDD_ETHERTYPE_802_1_X 0x888E #define HDD_ETHERTYPE_802_1_X_FRAME_OFFSET 12 -#define HDD_ETHERTYPE_802_1_X_SIZE 2 #ifdef FEATURE_WLAN_WAPI #define HDD_ETHERTYPE_WAI 0x88b4 #endif -#define HDD_80211_HEADER_LEN 24 -#define HDD_80211_HEADER_QOS_CTL 2 -#define HDD_LLC_HDR_LEN 6 -#define HDD_FRAME_TYPE_MASK 0x0c -#define HDD_FRAME_SUBTYPE_MASK 0xf0 -#define HDD_FRAME_TYPE_DATA 0x08 -#define HDD_FRAME_TYPE_MGMT 0x00 -#define HDD_FRAME_SUBTYPE_QOSDATA 0x80 -#define HDD_FRAME_SUBTYPE_DEAUTH 0xC0 -#define HDD_FRAME_SUBTYPE_DISASSOC 0xA0 -#define HDD_DEST_ADDR_OFFSET 6 - -#define HDD_MAC_HDR_SIZE 6 - #define HDD_PSB_CFG_INVALID 0xFF #define HDD_PSB_CHANGED 0xFF #define SME_QOS_UAPSD_CFG_BK_CHANGED_MASK 0xF1 @@ -68,8 +53,6 @@ #define SME_QOS_UAPSD_CFG_VI_CHANGED_MASK 0xF4 #define SME_QOS_UAPSD_CFG_VO_CHANGED_MASK 0xF8 -#define HDD_ETH_HEADER_LEN 14 - int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev); void hdd_tx_timeout(struct net_device *dev); CDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 75944d45d1b7..5c3b659ab8a9 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -89,8 +89,6 @@ #define g_mode_rates_size (12) #define a_mode_rates_size (8) -#define FREQ_BASE_80211G (2407) -#define FREQ_BAND_DIFF_80211G (5) #define GET_IE_LEN_IN_BSS_DESC(lenInBss) (lenInBss + sizeof(lenInBss) - \ ((uintptr_t)OFFSET_OF(tSirBssDescription, ieFields))) diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index df5620b51252..74ab785c50f9 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -388,7 +388,8 @@ static void hdd_conf_ns_offload(hdd_adapter_t *pAdapter, bool fenable) offLoadRequest.offloadType = SIR_IPV6_NS_OFFLOAD; offLoadRequest.enableOrDisable = SIR_OFFLOAD_ENABLE; cdf_mem_copy(&offLoadRequest.nsOffloadInfo.selfMacAddr, - &pAdapter->macAddressCurrent.bytes, SIR_MAC_ADDR_LEN); + &pAdapter->macAddressCurrent.bytes, + CDF_MAC_ADDR_SIZE); /* set number of ns offload address count */ offLoadRequest.num_ns_offload_count = count; /* Configure the Firmware with this */ diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c index 9b93e2711fa1..582b2dfd5713 100644 --- a/core/hdd/src/wlan_hdd_wmm.c +++ b/core/hdd/src/wlan_hdd_wmm.c @@ -81,10 +81,6 @@ #define WLAN_HDD_MAX_DSCP 0x3f -/* DHCP Port number */ -#define DHCP_SOURCE_PORT 0x4400 -#define DHCP_DESTINATION_PORT 0x4300 - #define HDD_WMM_UP_TO_AC_MAP_SIZE 8 const uint8_t hdd_wmm_up_to_ac_map[] = { diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index 6753bf860b9e..e075068b0864 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -71,7 +71,6 @@ #define SIR_SCAN_NO_HIDDEN_SSID 0 #define SIR_SCAN_HIDDEN_SSID_PE_DECISION 1 -#define SIR_MAC_ADDR_LEN 6 #define SIR_IPV4_ADDR_LEN 4 typedef uint8_t tSirIpv4Addr[SIR_IPV4_ADDR_LEN]; @@ -2549,7 +2548,7 @@ typedef struct sSirUpdateAPWPARSNIEsReq { #ifdef WLAN_NS_OFFLOAD typedef struct sSirNsOffloadReq { - uint8_t srcIPv6Addr[16]; + uint8_t srcIPv6Addr[SIR_MAC_IPV6_ADDR_LEN]; uint8_t selfIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN]; uint8_t targetIPv6Addr[SIR_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][SIR_MAC_IPV6_ADDR_LEN]; tSirMacAddr selfMacAddr; @@ -2564,8 +2563,8 @@ typedef struct sSirHostOffloadReq { uint8_t enableOrDisable; uint32_t num_ns_offload_count; union { - uint8_t hostIpv4Addr[4]; - uint8_t hostIpv6Addr[16]; + uint8_t hostIpv4Addr[SIR_IPV4_ADDR_LEN]; + uint8_t hostIpv6Addr[SIR_MAC_IPV6_ADDR_LEN]; } params; #ifdef WLAN_NS_OFFLOAD tSirNsOffloadReq nsOffloadInfo; @@ -2976,8 +2975,6 @@ typedef struct sSirRoamOffloadScanRsp { /*--------------------------------------------------------------------------- Packet Filtering Parameters ---------------------------------------------------------------------------*/ -#define SIR_IPV4_ADDR_LEN 4 -#define SIR_MAC_ADDR_LEN 6 #define SIR_MAX_FILTER_TEST_DATA_LEN 8 #define SIR_MAX_NUM_MULTICAST_ADDRESS 240 #define SIR_MAX_NUM_FILTERS 20 diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index 6b6b95c14d91..4952804d9d2a 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -64,10 +64,6 @@ #endif #define ASCII_SPACE_CHARACTER 0x20 -#define SUCCESS 1 - -#define MAX_BA_WINDOW_SIZE_FOR_CISCO 25 - /** ------------------------------------------------------------- \fn lim_delete_dialogue_token_list \brief deletes the complete lim dialogue token linked list. diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h index aa8eba8c7185..55408dfa445f 100644 --- a/core/sme/inc/csr_internal.h +++ b/core/sme/inc/csr_internal.h @@ -51,11 +51,6 @@ /* define scan return criteria. LIM should use these define as well */ #define CSR_SCAN_RETURN_AFTER_ALL_CHANNELS (0) #define CSR_SCAN_RETURN_AFTER_FIRST_MATCH (0x01) -#define CSR_SCAN_RETURN_AFTER_5_BAND_11d_FOUND (0x80) -#define CSR_SCAN_RETURN_AFTER_24_BAND_11d_FOUND (0x40) -#define CSR_SCAN_RETURN_AFTER_EITHER_BAND_11d_FOUND \ - (CSR_SCAN_RETURN_AFTER_5_BAND_11d_FOUND | \ - CSR_SCAN_RETURN_AFTER_24_BAND_11d_FOUND) #define CSR_NUM_RSSI_CAT 15 #define CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME 3 @@ -1243,8 +1238,6 @@ bool csr_is_concurrent_infra_connected(tpAniSirGlobal pMac); bool csr_is_concurrent_session_running(tpAniSirGlobal pMac); bool csr_is_infra_ap_started(tpAniSirGlobal pMac); bool csr_is_ibss_started(tpAniSirGlobal pMac); -bool csr_is_btamp_started(tpAniSirGlobal pMac); -bool csr_is_btamp(tpAniSirGlobal pMac, uint32_t sessionId); bool csr_is_valid_mc_concurrent_session(tpAniSirGlobal pMac, uint32_t sessionId, tSirBssDescription *pBssDesc); bool csr_is_conn_state_connected_infra_ap(tpAniSirGlobal pMac, diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 7614b1eae1b8..f62c5a2a85fc 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -224,10 +224,6 @@ typedef struct tagRoamingTimerInfo { ((pIes)->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD)) || \ ((pIes)->WMMInfoAp.present && (pIes)->WMMInfoAp.uapsd)) -/* This macro returns the total len needed of Tlv with with len bytes of data */ -#define GET_TLV_MSG_LEN(len) \ - GET_ROUND_UP((sizeof(tCsrCfgMsgTlvHdr) + (len)), sizeof(uint32_t)) - bool csr_get_bss_id_bss_desc(tHalHandle hHal, tSirBssDescription *pSirBssDesc, struct cdf_mac_addr *pBssId); bool csr_is_bss_id_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index e82c1515cec8..91f6526aedf0 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -71,8 +71,6 @@ #define SME_INVALID_COUNTRY_CODE "XX" -#define SME_2_4_GHZ_MAX_FREQ 3000 - #define SME_SET_CHANNEL_REG_POWER(reg_info_1, val) do { \ reg_info_1 &= 0xff00ffff; \ reg_info_1 |= ((val & 0xff) << 16); \ diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1f511656b5cb..d53f36ab5a4f 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -63,8 +63,6 @@ extern tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb); #define LOG_SIZE 256 -#define READ_MEMORY_DUMP_CMD 9 -#define TL_INIT_STATE 0 static tSelfRecoveryStats g_self_recovery_stats; /* TxMB Functions */ diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index d45482d357be..a116307655d0 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -893,22 +893,6 @@ bool csr_is_ibss_started(tpAniSirGlobal pMac) return fRc; } -bool csr_is_btamp_started(tpAniSirGlobal pMac) -{ - uint32_t i; - bool fRc = false; - - for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) { - if (CSR_IS_SESSION_VALID(pMac, i) - && csr_is_conn_state_connected_wds(pMac, i)) { - fRc = true; - break; - } - } - - return fRc; -} - bool csr_is_concurrent_session_running(tpAniSirGlobal pMac) { uint32_t sessionId, noOfCocurrentSession = 0; @@ -954,11 +938,6 @@ bool csr_is_infra_ap_started(tpAniSirGlobal pMac) } -bool csr_is_btamp(tpAniSirGlobal pMac, uint32_t sessionId) -{ - return csr_is_conn_state_connected_wds(pMac, sessionId); -} - bool csr_is_conn_state_disconnected(tpAniSirGlobal pMac, uint32_t sessionId) { return eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED == diff --git a/core/sme/src/oem_data/oem_data_api.c b/core/sme/src/oem_data/oem_data_api.c index 385b77d4bc32..8fa6b8999aa7 100644 --- a/core/sme/src/oem_data/oem_data_api.c +++ b/core/sme/src/oem_data/oem_data_api.c @@ -369,12 +369,10 @@ CDF_STATUS oem_data_is_oem_data_req_allowed(tHalHandle hHal) for (sessionId = 0; sessionId < CSR_ROAM_SESSION_MAX; sessionId++) { if (CSR_IS_SESSION_VALID(pMac, sessionId)) { - /* co-exist with IBSS or BT-AMP mode is not supported */ - if (csr_is_conn_state_ibss(pMac, sessionId) - || csr_is_btamp(pMac, sessionId)) { - /* co-exist with IBSS or BT-AMP mode is not supported */ + /* co-exist with IBSS mode is not supported */ + if (csr_is_conn_state_ibss(pMac, sessionId)) { sms_log(pMac, LOGW, - "OEM DATA REQ is not allowed due to IBSS|BTAMP exist in session %d", + "OEM DATA REQ is not allowed due to IBSS exist in session %d", sessionId); status = CDF_STATUS_CSR_WRONG_STATE; break;