Commit 38224101 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Greg Kroah-Hartman

ath6kl: remove define HTC_EP_STAT_PROFILING

This is always set so just keep the code it idefs around.

Cc: Naveen Singh <nsingh@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e53a79d9
...@@ -110,7 +110,6 @@ ifeq ($(CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK),y) ...@@ -110,7 +110,6 @@ ifeq ($(CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK),y)
ccflags-y += -DATH6KL_SKIP_ABI_VERSION_CHECK ccflags-y += -DATH6KL_SKIP_ABI_VERSION_CHECK
endif endif
ccflags-y += -DHTC_EP_STAT_PROFILING
ccflags-y += -DWAPI_ENABLE ccflags-y += -DWAPI_ENABLE
ccflags-y += -DCHECKSUM_OFFLOAD ccflags-y += -DCHECKSUM_OFFLOAD
ccflags-y += -DWLAN_HEADERS ccflags-y += -DWLAN_HEADERS
......
...@@ -448,9 +448,7 @@ static void ResetEndpointStates(struct htc_target *target) ...@@ -448,9 +448,7 @@ static void ResetEndpointStates(struct htc_target *target)
pEndpoint->ServiceID = 0; pEndpoint->ServiceID = 0;
pEndpoint->MaxMsgLength = 0; pEndpoint->MaxMsgLength = 0;
pEndpoint->MaxTxQueueDepth = 0; pEndpoint->MaxTxQueueDepth = 0;
#ifdef HTC_EP_STAT_PROFILING
A_MEMZERO(&pEndpoint->EndPointStats,sizeof(pEndpoint->EndPointStats)); A_MEMZERO(&pEndpoint->EndPointStats,sizeof(pEndpoint->EndPointStats));
#endif
INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBuffers); INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBuffers);
INIT_HTC_PACKET_QUEUE(&pEndpoint->TxQueue); INIT_HTC_PACKET_QUEUE(&pEndpoint->TxQueue);
INIT_HTC_PACKET_QUEUE(&pEndpoint->RecvIndicationQueue); INIT_HTC_PACKET_QUEUE(&pEndpoint->RecvIndicationQueue);
...@@ -527,7 +525,6 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle, ...@@ -527,7 +525,6 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle,
struct htc_endpoint_stats *pStats) struct htc_endpoint_stats *pStats)
{ {
#ifdef HTC_EP_STAT_PROFILING
struct htc_target *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle); struct htc_target *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
bool clearStats = false; bool clearStats = false;
bool sample = false; bool sample = false;
...@@ -568,9 +565,6 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle, ...@@ -568,9 +565,6 @@ bool HTCGetEndpointStatistics(HTC_HANDLE HTCHandle,
UNLOCK_HTC_TX(target); UNLOCK_HTC_TX(target);
return true; return true;
#else
return false;
#endif
} }
struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle) struct ar6k_device *HTCGetAR6KDevice(void *HTCHandle)
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
* processing errors, the last frame header is dump for comparison */ * processing errors, the last frame header is dump for comparison */
//#define HTC_CAPTURE_LAST_FRAME //#define HTC_CAPTURE_LAST_FRAME
//#define HTC_EP_STAT_PROFILING
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
...@@ -82,17 +81,10 @@ struct htc_endpoint { ...@@ -82,17 +81,10 @@ struct htc_endpoint {
struct htc_target *target; /* back pointer to target */ struct htc_target *target; /* back pointer to target */
u8 SeqNo; /* TX seq no (helpful) for debugging */ u8 SeqNo; /* TX seq no (helpful) for debugging */
u32 LocalConnectionFlags; /* local connection flags */ u32 LocalConnectionFlags; /* local connection flags */
#ifdef HTC_EP_STAT_PROFILING
struct htc_endpoint_stats EndPointStats; /* endpoint statistics */ struct htc_endpoint_stats EndPointStats; /* endpoint statistics */
#endif
}; };
#ifdef HTC_EP_STAT_PROFILING
#define INC_HTC_EP_STAT(p,stat,count) (p)->EndPointStats.stat += (count); #define INC_HTC_EP_STAT(p,stat,count) (p)->EndPointStats.stat += (count);
#else
#define INC_HTC_EP_STAT(p,stat,count)
#endif
#define HTC_SERVICE_TX_PACKET_TAG HTC_TX_PACKET_TAG_INTERNAL #define HTC_SERVICE_TX_PACKET_TAG HTC_TX_PACKET_TAG_INTERNAL
#define NUM_CONTROL_BUFFERS 8 #define NUM_CONTROL_BUFFERS 8
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
(pP)->PktInfo.AsRx.ExpectedHdr, \ (pP)->PktInfo.AsRx.ExpectedHdr, \
(pP)->Endpoint)) (pP)->Endpoint))
#ifdef HTC_EP_STAT_PROFILING
#define HTC_RX_STAT_PROFILE(t,ep,numLookAheads) \ #define HTC_RX_STAT_PROFILE(t,ep,numLookAheads) \
{ \ { \
INC_HTC_EP_STAT((ep), RxReceived, 1); \ INC_HTC_EP_STAT((ep), RxReceived, 1); \
...@@ -46,9 +45,6 @@ ...@@ -46,9 +45,6 @@
INC_HTC_EP_STAT((ep), RxBundleLookAheads, 1); \ INC_HTC_EP_STAT((ep), RxBundleLookAheads, 1); \
} \ } \
} }
#else
#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)
#endif
static void DoRecvCompletion(struct htc_endpoint *pEndpoint, static void DoRecvCompletion(struct htc_endpoint *pEndpoint,
struct htc_packet_queue *pQueueToIndicate) struct htc_packet_queue *pQueueToIndicate)
...@@ -931,12 +927,10 @@ static void HTCAsyncRecvScatterCompletion(struct hif_scatter_req *pScatterReq) ...@@ -931,12 +927,10 @@ static void HTCAsyncRecvScatterCompletion(struct hif_scatter_req *pScatterReq)
} }
if (!status) { if (!status) {
#ifdef HTC_EP_STAT_PROFILING
LOCK_HTC_RX(target); LOCK_HTC_RX(target);
HTC_RX_STAT_PROFILE(target,pEndpoint,numLookAheads); HTC_RX_STAT_PROFILE(target,pEndpoint,numLookAheads);
INC_HTC_EP_STAT(pEndpoint, RxPacketsBundled, 1); INC_HTC_EP_STAT(pEndpoint, RxPacketsBundled, 1);
UNLOCK_HTC_RX(target); UNLOCK_HTC_RX(target);
#endif
if (i == (pScatterReq->ValidScatterEntries - 1)) { if (i == (pScatterReq->ValidScatterEntries - 1)) {
/* last packet's more packets flag is set based on the lookahead */ /* last packet's more packets flag is set based on the lookahead */
SET_MORE_RX_PACKET_INDICATION_FLAG(lookAheads,numLookAheads,pEndpoint,pPacket); SET_MORE_RX_PACKET_INDICATION_FLAG(lookAheads,numLookAheads,pEndpoint,pPacket);
......
...@@ -776,9 +776,6 @@ void HTCProcessCreditRpt(struct htc_target *target, HTC_CREDIT_REPORT *pRpt, int ...@@ -776,9 +776,6 @@ void HTCProcessCreditRpt(struct htc_target *target, HTC_CREDIT_REPORT *pRpt, int
AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Endpoint %d got %d credits \n", AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Endpoint %d got %d credits \n",
pRpt->EndpointID, pRpt->Credits)); pRpt->EndpointID, pRpt->Credits));
#ifdef HTC_EP_STAT_PROFILING
INC_HTC_EP_STAT(pEndpoint, TxCreditRpts, 1); INC_HTC_EP_STAT(pEndpoint, TxCreditRpts, 1);
INC_HTC_EP_STAT(pEndpoint, TxCreditsReturned, pRpt->Credits); INC_HTC_EP_STAT(pEndpoint, TxCreditsReturned, pRpt->Credits);
...@@ -797,8 +794,6 @@ void HTCProcessCreditRpt(struct htc_target *target, HTC_CREDIT_REPORT *pRpt, int ...@@ -797,8 +794,6 @@ void HTCProcessCreditRpt(struct htc_target *target, HTC_CREDIT_REPORT *pRpt, int
INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromOther, 1); INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromOther, 1);
} }
#endif
if (ENDPOINT_0 == pRpt->EndpointID) { if (ENDPOINT_0 == pRpt->EndpointID) {
/* always give endpoint 0 credits back */ /* always give endpoint 0 credits back */
pEndpoint->CreditDist.TxCredits += pRpt->Credits; pEndpoint->CreditDist.TxCredits += pRpt->Credits;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment