From 2790a3cc82b864faf924d703640a4f1dc61d8802 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sun, 25 Nov 2012 19:28:57 -0500 Subject: [PATCH] Staging: bcm: Remove typedef for _S_MIBS_DROPPED_APP_CNTRL_MESSAGES and call directly. This patch removes typedef for _S_MIBS_DROPPED_APP_CNTRL_MESSAGES, and changes the name of the struct to bcm_mibs_dropped_cntrl_msg. In addition, any calls to typedef S_MIBS_DROPPED_APP_CNTRL_MESSAGES are changed to call the struct directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/Adapter.h | 2 +- drivers/staging/bcm/HandleControlPacket.c | 2 +- drivers/staging/bcm/HostMIBSInterface.h | 6 +++--- drivers/staging/bcm/hostmibs.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h index 8c1465af3c32..15e88380da43 100644 --- a/drivers/staging/bcm/Adapter.h +++ b/drivers/staging/bcm/Adapter.h @@ -198,7 +198,7 @@ struct bcm_tarang_data { int AppCtrlQueueLen; BOOLEAN MacTracingEnabled; BOOLEAN bApplicationToExit; - S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs; + struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs; ULONG RxCntrlMsgBitMask; }; diff --git a/drivers/staging/bcm/HandleControlPacket.c b/drivers/staging/bcm/HandleControlPacket.c index 25e5c68bfe85..1bb53e247a62 100644 --- a/drivers/staging/bcm/HandleControlPacket.c +++ b/drivers/staging/bcm/HandleControlPacket.c @@ -226,7 +226,7 @@ INT flushAllAppQ(void) pTarang->AppCtrlQueueLen = 0; /* dropped contrl packet statistics also should be reset. */ memset((PVOID)&pTarang->stDroppedAppCntrlMsgs, 0, - sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES)); + sizeof(struct bcm_mibs_dropped_cntrl_msg)); } return STATUS_SUCCESS; diff --git a/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h index 7c7c75618cd7..e697b03e1510 100644 --- a/drivers/staging/bcm/HostMIBSInterface.h +++ b/drivers/staging/bcm/HostMIBSInterface.h @@ -170,7 +170,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE { unsigned int uiTotalTxBytes; } S_MIBS_SERVICEFLOW_TABLE; -typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES { +struct bcm_mibs_dropped_cntrl_msg { unsigned long cm_responses; unsigned long cm_control_newdsx_multiclassifier_resp; unsigned long link_control_resp; @@ -179,14 +179,14 @@ typedef struct _S_MIBS_DROPPED_APP_CNTRL_MESSAGES { unsigned long idle_mode_status; unsigned long auth_ss_host_msg; unsigned long low_priority_message; -} S_MIBS_DROPPED_APP_CNTRL_MESSAGES; +}; struct bcm_host_stats_mibs { S_MIBS_HOST_INFO stHostInfo; S_MIBS_CLASSIFIER_RULE astClassifierTable[MIBS_MAX_CLASSIFIERS]; S_MIBS_SERVICEFLOW_TABLE astSFtable[MIBS_MAX_SERVICEFLOWS]; S_MIBS_PHS_RULE astPhsRulesTable[MIBS_MAX_PHSRULES]; - S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs; + struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs; }; #endif diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c index 23ff8325fa8b..e7dc39ea7ae6 100644 --- a/drivers/staging/bcm/hostmibs.c +++ b/drivers/staging/bcm/hostmibs.c @@ -98,7 +98,7 @@ VOID GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct b { memcpy(&(pstHostMibs->stDroppedAppCntrlMsgs), &(pTarang->stDroppedAppCntrlMsgs), - sizeof(S_MIBS_DROPPED_APP_CNTRL_MESSAGES)); + sizeof(struct bcm_mibs_dropped_cntrl_msg)); } VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex) -- 2.20.1