From 2906ce194364102707395307177d8f6eedf58471 Mon Sep 17 00:00:00 2001 From: Nandha Kishore Easwaran Date: Fri, 4 Nov 2016 13:12:25 +0530 Subject: [PATCH] qcacmn: Remove unnecessary flags Remove the unnecessary compilation flags from cmn_dev Change-Id: I39cb16122d1db930f1c759e206daedf85eebf612 Crs-fixed: 1075597 --- dp/inc/cdp_txrx_host_stats.h | 18 ------------------ dp/inc/cdp_txrx_me.h | 5 ----- dp/inc/cdp_txrx_ops.h | 31 ++----------------------------- dp/inc/cdp_txrx_pflow.h | 2 -- dp/inc/cdp_txrx_stats_struct.h | 8 -------- dp/inc/cdp_txrx_wds.h | 2 -- 6 files changed, 2 insertions(+), 64 deletions(-) diff --git a/dp/inc/cdp_txrx_host_stats.h b/dp/inc/cdp_txrx_host_stats.h index e218e3df0d..72d80ed74f 100644 --- a/dp/inc/cdp_txrx_host_stats.h +++ b/dp/inc/cdp_txrx_host_stats.h @@ -36,7 +36,6 @@ /* Need to rename the function to reflect the functionality "show" / "display" * WIN -- to figure out whether to change OSIF to converge (not an immediate AI) * */ -#if WLAN_FEATURE_FASTPATH static inline int cdp_host_stats_get(ol_txrx_soc_handle soc, void *vdev, struct ol_txrx_stats_req *req) @@ -101,7 +100,6 @@ cdp_disable_enhanced_stats(ol_txrx_soc_handle soc, void *pdev) return; } -#if ENHANCED_STATS /** * @brief Get the desired stats from the message. * @@ -119,9 +117,6 @@ static inline uint32_t *cdp_get_stats_base (pdev, stats_base, msg_len, type); return 0; } -#endif -#endif /* WLAN_FEATURE_FASTPATH*/ -#if (HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE) static inline void cdp_tx_print_tso_stats(ol_txrx_soc_handle soc, void *vdev) @@ -138,9 +133,7 @@ cdp_tx_rst_tso_stats(ol_txrx_soc_handle soc, void *vdev) return soc->ops->host_stats_ops->tx_rst_tso_stats(vdev); return; } -#endif /* HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE */ -#if HOST_SW_SG_ENABLE static inline void cdp_tx_print_sg_stats(ol_txrx_soc_handle soc, void *vdev) @@ -157,9 +150,7 @@ cdp_tx_rst_sg_stats(ol_txrx_soc_handle soc, void *vdev) return soc->ops->host_stats_ops->tx_rst_sg_stats(vdev); return; } -#endif /* HOST_SW_SG_ENABLE */ -#if RX_CHECKSUM_OFFLOAD static inline void cdp_print_rx_cksum_stats(ol_txrx_soc_handle soc, void *vdev) @@ -176,9 +167,7 @@ cdp_rst_rx_cksum_stats(ol_txrx_soc_handle soc, void *vdev) return soc->ops->host_stats_ops->rst_rx_cksum_stats(vdev); return; } -#endif /* RX_CHECKSUM_OFFLOAD */ -#if (ATH_SUPPORT_IQUE && WLAN_FEATURE_FASTPATH) static inline A_STATUS cdp_host_me_stats(ol_txrx_soc_handle soc, void *vdev) { @@ -186,8 +175,6 @@ cdp_host_me_stats(ol_txrx_soc_handle soc, void *vdev) return soc->ops->host_stats_ops->txrx_host_me_stats(vdev); return 0; } -#endif /* WLAN_FEATURE_FASTPATH */ -#if PEER_FLOW_CONTROL static inline void cdp_per_peer_stats (ol_txrx_soc_handle soc, void *pdev, char *addr) { @@ -197,8 +184,6 @@ static inline void cdp_per_peer_stats return; } -#endif -#if WLAN_FEATURE_FASTPATH && PEER_FLOW_CONTROL static inline int cdp_host_msdu_ttl_stats(ol_txrx_soc_handle soc, void *vdev, struct ol_txrx_stats_req *req) @@ -208,11 +193,9 @@ static inline int cdp_host_msdu_ttl_stats(ol_txrx_soc_handle soc, (vdev, req); return 0; } -#endif -#if HOST_SW_LRO_ENABLE static inline void cdp_print_lro_stats(ol_txrx_soc_handle soc, void *vdev) { @@ -228,7 +211,6 @@ cdp_reset_lro_stats(ol_txrx_soc_handle soc, void *vdev) return soc->ops->host_stats_ops->reset_lro_stats(vdev); return; } -#endif /* HOST_SW_LRO_ENABLE */ /** diff --git a/dp/inc/cdp_txrx_me.h b/dp/inc/cdp_txrx_me.h index c4b0980fca..34746841b0 100644 --- a/dp/inc/cdp_txrx_me.h +++ b/dp/inc/cdp_txrx_me.h @@ -34,7 +34,6 @@ #include /* TODO: adf need to be replaced with qdf */ -#if ATH_SUPPORT_ME_FW_BASED static inline u_int16_t cdp_tx_desc_alloc_and_mark_for_mcast_clone(ol_txrx_soc_handle soc, @@ -67,7 +66,6 @@ cdp_tx_get_mcast_buf_allocated_marked(ol_txrx_soc_handle soc, (pdev); return 0; } -#else static inline void cdp_tx_me_alloc_descriptor(ol_txrx_soc_handle soc, void *pdev) @@ -94,9 +92,7 @@ cdp_tx_me_convert_ucast(ol_txrx_soc_handle soc, void *vdev, (vdev, wbuf, newmac, newmaccnt); return 0; } -#endif /* Should be a function pointer in ol_txrx_osif_ops{} */ -#if ATH_MCAST_HOST_INSPECT /** * @brief notify mcast frame indication from FW. * @details @@ -116,4 +112,3 @@ static inline int cdp_mcast_notify(ol_txrx_soc_handle soc, void *pdev, return 0; } #endif -#endif diff --git a/dp/inc/cdp_txrx_ops.h b/dp/inc/cdp_txrx_ops.h index 270ea7a797..9518d6fbe9 100644 --- a/dp/inc/cdp_txrx_ops.h +++ b/dp/inc/cdp_txrx_ops.h @@ -109,7 +109,7 @@ struct cdp_cmn_ops { int max_subfrms_amsdu); int(*txrx_fw_stats_get)(void *vdev, - struct ol_txrx_stats_req *req, bool response_expected); + struct ol_txrx_stats_req *req, bool per_vdev, bool response_expected); int(*txrx_debug)(void *vdev, int debug_specs); @@ -313,9 +313,8 @@ struct cdp_ctrl_ops { struct cdp_me_ops { -#if ATH_SUPPORT_ME_FW_BASED u_int16_t (*tx_desc_alloc_and_mark_for_mcast_clone) - (void *pdev, u_int16_t buf_count) + (void *pdev, u_int16_t buf_count); u_int16_t (*tx_desc_free_and_unmark_for_mcast_clone)( void *pdev, @@ -324,7 +323,6 @@ struct cdp_me_ops { u_int16_t (*tx_get_mcast_buf_allocated_marked) (void *pdev); -#else void (*tx_me_alloc_descriptor)(void *pdev); @@ -335,9 +333,7 @@ struct cdp_me_ops { (*tx_me_convert_ucast)(void *vdev, qdf_nbuf_t wbuf, u_int8_t newmac[][6], uint8_t newmaccnt); -#endif /* Should be a function pointer in ol_txrx_osif_ops{} */ -#if ATH_MCAST_HOST_INSPECT /** * @brief notify mcast frame indication from FW. * @details @@ -351,7 +347,6 @@ struct cdp_me_ops { int (*mcast_notify)(void *pdev, u_int8_t vdev_id, qdf_nbuf_t msdu); -#endif }; struct cdp_mon_ops { @@ -374,7 +369,6 @@ struct cdp_mon_ops { }; struct cdp_host_stats_ops { -#if WLAN_FEATURE_FASTPATH int (*txrx_host_stats_get)(void *vdev, struct ol_txrx_stats_req *req); @@ -400,7 +394,6 @@ struct cdp_host_stats_ops { */ void (*txrx_disable_enhanced_stats)(void *pdev); -#if ENHANCED_STATS /** * @brief Get the desired stats from the message. * @@ -411,61 +404,43 @@ struct cdp_host_stats_ops { */ uint32_t*(*txrx_get_stats_base)(void *pdev, uint32_t *stats_base, uint32_t msg_len, uint8_t type); -#endif -#endif /* WLAN_FEATURE_FASTPATH*/ -#if (HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE) void (*tx_print_tso_stats)(void *vdev); void (*tx_rst_tso_stats)(void *vdev); -#endif /* HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE */ -#if HOST_SW_SG_ENABLE void (*tx_print_sg_stats)(void *vdev); void (*tx_rst_sg_stats)(void *vdev); -#endif /* HOST_SW_SG_ENABLE */ -#if RX_CHECKSUM_OFFLOAD void (*print_rx_cksum_stats)(void *vdev); void (*rst_rx_cksum_stats)(void *vdev); -#endif /* RX_CHECKSUM_OFFLOAD */ -#if (ATH_SUPPORT_IQUE && WLAN_FEATURE_FASTPATH) A_STATUS (*txrx_host_me_stats)(void *vdev); -#endif /* WLAN_FEATURE_FASTPATH */ -#if PEER_FLOW_CONTROL void (*txrx_per_peer_stats)(void *pdev, char *addr); -#endif -#if WLAN_FEATURE_FASTPATH && PEER_FLOW_CONTROL int (*txrx_host_msdu_ttl_stats)(void *vdev, struct ol_txrx_stats_req *req); -#endif -#if HOST_SW_LRO_ENABLE void (*print_lro_stats)(void *vdev); void (*reset_lro_stats)(void *vdev); -#endif /* HOST_SW_LRO_ENABLE */ }; struct cdp_wds_ops { -#if WDS_VENDOR_EXTENSION void (*txrx_set_wds_rx_policy)(void *vdev, u_int32_t val); -#endif }; @@ -477,10 +452,8 @@ struct cdp_raw_ops { }; struct cdp_pflow_ops { -#if PEER_FLOW_CONTROL uint32_t(*pflow_update_pdev_params)(void *, ol_ath_param_t, uint32_t, void *); -#endif }; struct cdp_mob_drv_ops { diff --git a/dp/inc/cdp_txrx_pflow.h b/dp/inc/cdp_txrx_pflow.h index e5a5c56e30..e55d6b97c2 100644 --- a/dp/inc/cdp_txrx_pflow.h +++ b/dp/inc/cdp_txrx_pflow.h @@ -35,7 +35,6 @@ #include #include "cdp_txrx_ops.h" -#if PEER_FLOW_CONTROL static inline uint32_t cdp_pflow_update_pdev_params (ol_txrx_soc_handle soc, void *pdev, ol_ath_param_t param, uint32_t val, void *ctx) @@ -46,4 +45,3 @@ static inline uint32_t cdp_pflow_update_pdev_params return 0; } #endif -#endif diff --git a/dp/inc/cdp_txrx_stats_struct.h b/dp/inc/cdp_txrx_stats_struct.h index 8771fc420a..6aaf0c2403 100644 --- a/dp/inc/cdp_txrx_stats_struct.h +++ b/dp/inc/cdp_txrx_stats_struct.h @@ -91,7 +91,6 @@ struct ol_txrx_stats { u_int32_t dma_map_error; /* MSDUs given to the txrx layer by the management stack */ ol_txrx_stats_elem mgmt; -#if (HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE) struct { /* TSO applied jumbo packets received from NW Stack */ ol_txrx_stats_elem tso_pkts; @@ -102,9 +101,7 @@ struct ol_txrx_stats { /* TSO Descriptors */ u_int32_t tso_desc_cnt; } tso; -#endif /* HOST_SW_TSO_ENABLE || HOST_SW_TSO_SG_ENABLE */ -#if HOST_SW_SG_ENABLE struct { /* TSO applied jumbo packets received from NW Stack */ ol_txrx_stats_elem sg_pkts; @@ -115,7 +112,6 @@ struct ol_txrx_stats { /* TSO Descriptors */ u_int32_t sg_desc_cnt; } sg; -#endif /* HOST_SW_SG_ENABLE */ struct { /* packets enqueued for flow control */ u_int32_t fl_ctrl_enqueue; @@ -130,7 +126,6 @@ struct ol_txrx_stats { ol_txrx_stats_elem delivered; /* MSDUs forwarded from the rx path to the tx path */ ol_txrx_stats_elem forwarded; -#if RX_CHECKSUM_OFFLOAD /* MSDUs in which ipv4 chksum error detected by HW */ ol_txrx_stats_elem ipv4_cksum_err; /* MSDUs in which tcp chksum error detected by HW */ @@ -141,7 +136,6 @@ struct ol_txrx_stats { ol_txrx_stats_elem tcp_ipv6_cksum_err; /* MSDUs in which UDP V6 chksum error detected by HW */ ol_txrx_stats_elem udp_ipv6_cksum_err; -#endif /* RX_CHECKSUM_OFFLOAD */ } rx; struct { /* Number of mcast recieved for conversion */ @@ -391,7 +385,6 @@ typedef enum _ol_ath_param_t { OL_ATH_PARAM_FW_DUMP_NO_HOST_CRASH = 210, /*Consider OBSS non-erp to change to long slot*/ OL_ATH_PARAM_CONSIDER_OBSS_NON_ERP_LONG_SLOT = 211, -#if PEER_FLOW_CONTROL OL_ATH_PARAM_STATS_FC, OL_ATH_PARAM_QFLUSHINTERVAL, OL_ATH_PARAM_TOTAL_Q_SIZE, @@ -408,7 +401,6 @@ typedef enum _ol_ath_param_t { OL_ATH_PARAM_LATENCY_PROFILE, OL_ATH_PARAM_HOSTQ_DUMP, OL_ATH_PARAM_TIDQ_MAP, -#endif OL_ATH_PARAM_DBG_ARP_SRC_ADDR, /* ARP DEBUG source address*/ OL_ATH_PARAM_DBG_ARP_DST_ADDR, /* ARP DEBUG destination address*/ OL_ATH_PARAM_ARP_DBG_CONF, /* ARP debug configuration */ diff --git a/dp/inc/cdp_txrx_wds.h b/dp/inc/cdp_txrx_wds.h index 5c9d08cbb3..6e74c5e0d4 100644 --- a/dp/inc/cdp_txrx_wds.h +++ b/dp/inc/cdp_txrx_wds.h @@ -42,7 +42,6 @@ * @param val - the wds rx policy bitmask * @return - void */ -#if WDS_VENDOR_EXTENSION static inline void cdp_set_wds_rx_policy(ol_txrx_soc_handle soc, void *vdev, @@ -54,4 +53,3 @@ cdp_set_wds_rx_policy(ol_txrx_soc_handle soc, } #endif -#endif