From 7d4aa28fc843548b2c79089a255cd75d654adb48 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sun, 25 Nov 2012 19:28:58 -0500
Subject: [PATCH] --- yaml --- r: 338197 b: refs/heads/master c:
 ba738b43e4d8f82aa17767f9d4707ac301720cbc h: refs/heads/master i:   338195:
 87421c0abfd67a70ea336a02232b298f2caa7586 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/bcm/CmHost.c            | 2 +-
 trunk/drivers/staging/bcm/HostMIBSInterface.h | 6 +++---
 trunk/drivers/staging/bcm/hostmibs.c          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fecba2bc52e6..7a6fc4b30d98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2790a3cc82b864faf924d703640a4f1dc61d8802
+refs/heads/master: ba738b43e4d8f82aa17767f9d4707ac301720cbc
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
index 482e59592cd6..23ddc3d7c9ea 100644
--- a/trunk/drivers/staging/bcm/CmHost.c
+++ b/trunk/drivers/staging/bcm/CmHost.c
@@ -107,7 +107,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn
 	DeleteAllClassifiersForSF(Adapter, uiSearchRuleIndex);
 
 	/* Resetting only MIBS related entries in the SF */
-	memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(S_MIBS_SERVICEFLOW_TABLE));
+	memset((PVOID)&Adapter->PackInfo[uiSearchRuleIndex], 0, sizeof(struct bcm_mibs_table));
 }
 
 static inline VOID
diff --git a/trunk/drivers/staging/bcm/HostMIBSInterface.h b/trunk/drivers/staging/bcm/HostMIBSInterface.h
index e697b03e1510..0698ce04e8fb 100644
--- a/trunk/drivers/staging/bcm/HostMIBSInterface.h
+++ b/trunk/drivers/staging/bcm/HostMIBSInterface.h
@@ -137,7 +137,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
 	u32 wmanIfCmnCpsTargetSaid;
 } S_MIBS_EXTSERVICEFLOW_PARAMETERS;
 
-typedef struct _S_MIBS_SERVICEFLOW_TABLE {
+struct bcm_mibs_table {
 	unsigned long	ulSFID;
 	unsigned short	usVCID_Value;
 	unsigned int	uiThreshold;
@@ -168,7 +168,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
 	unsigned int	uiThisPeriodRxBytes;
 	unsigned int	uiTotalRxBytes;
 	unsigned int	uiTotalTxBytes;
-} S_MIBS_SERVICEFLOW_TABLE;
+};
 
 struct bcm_mibs_dropped_cntrl_msg {
 	unsigned long cm_responses;
@@ -184,7 +184,7 @@ struct bcm_mibs_dropped_cntrl_msg {
 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];
+	struct bcm_mibs_table	astSFtable[MIBS_MAX_SERVICEFLOWS];
 	S_MIBS_PHS_RULE		astPhsRulesTable[MIBS_MAX_PHSRULES];
 	struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
 };
diff --git a/trunk/drivers/staging/bcm/hostmibs.c b/trunk/drivers/staging/bcm/hostmibs.c
index e7dc39ea7ae6..2fbe29c54331 100644
--- a/trunk/drivers/staging/bcm/hostmibs.c
+++ b/trunk/drivers/staging/bcm/hostmibs.c
@@ -39,7 +39,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m
 		if (Adapter->PackInfo[nSfIndex].bValid) {
 			memcpy((PVOID) & pstHostMibs->astSFtable[nSfIndex],
 			       (PVOID) & Adapter->PackInfo[nSfIndex],
-			       sizeof(S_MIBS_SERVICEFLOW_TABLE));
+				sizeof(struct bcm_mibs_table));
 		} else {
 			/* If index in not valid,
 			 * don't process this for the PHS table.