From 7b5120a3d4af31ce9b4339ec1ea5ce4012ab4d1f Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sun, 25 Nov 2012 19:28:59 -0500
Subject: [PATCH] --- yaml --- r: 338198 b: refs/heads/master c:
 8c7d51a3e83cfd508e7e766177be57ec7c829f54 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7a6fc4b30d98..ce0888a19f5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba738b43e4d8f82aa17767f9d4707ac301720cbc
+refs/heads/master: 8c7d51a3e83cfd508e7e766177be57ec7c829f54
diff --git a/trunk/drivers/staging/bcm/Adapter.h b/trunk/drivers/staging/bcm/Adapter.h
index 15e88380da43..f57794827f73 100644
--- a/trunk/drivers/staging/bcm/Adapter.h
+++ b/trunk/drivers/staging/bcm/Adapter.h
@@ -151,7 +151,7 @@ struct bcm_packet_info {
 	UINT		NumOfPacketsSent;
 	UCHAR		ucDirection;
 	USHORT		usCID;
-	S_MIBS_EXTSERVICEFLOW_PARAMETERS	stMibsExtServiceFlowTable;
+	struct bcm_mibs_parameters stMibsExtServiceFlowTable;
 	UINT		uiCurrentRxRate;
 	UINT		uiThisPeriodRxBytes;
 	UINT		uiTotalRxBytes;
diff --git a/trunk/drivers/staging/bcm/HostMIBSInterface.h b/trunk/drivers/staging/bcm/HostMIBSInterface.h
index 0698ce04e8fb..a09e3540fde2 100644
--- a/trunk/drivers/staging/bcm/HostMIBSInterface.h
+++ b/trunk/drivers/staging/bcm/HostMIBSInterface.h
@@ -113,7 +113,7 @@ typedef struct _S_MIBS_PHS_RULE {
 	unsigned long	PHSErrorNumPackets;
 } S_MIBS_PHS_RULE;
 
-typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
+struct bcm_mibs_parameters {
 	u32 wmanIfSfid;
 	u32 wmanIfCmnCpsSfState;
 	u32 wmanIfCmnCpsMaxSustainedRate;
@@ -135,7 +135,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
 	u32 wmanIfCmnCpsReqTxPolicy;
 	u32 wmanIfCmnSfCsSpecification;
 	u32 wmanIfCmnCpsTargetSaid;
-} S_MIBS_EXTSERVICEFLOW_PARAMETERS;
+};
 
 struct bcm_mibs_table {
 	unsigned long	ulSFID;
@@ -163,7 +163,7 @@ struct bcm_mibs_table {
 	unsigned int	NumOfPacketsSent;
 	unsigned char ucDirection;
 	unsigned short	usCID;
-	S_MIBS_EXTSERVICEFLOW_PARAMETERS stMibsExtServiceFlowTable;
+	struct bcm_mibs_parameters stMibsExtServiceFlowTable;
 	unsigned int	uiCurrentRxRate;
 	unsigned int	uiThisPeriodRxBytes;
 	unsigned int	uiTotalRxBytes;
diff --git a/trunk/drivers/staging/bcm/Misc.c b/trunk/drivers/staging/bcm/Misc.c
index 9e9a93627dd9..c92078e7fe86 100644
--- a/trunk/drivers/staging/bcm/Misc.c
+++ b/trunk/drivers/staging/bcm/Misc.c
@@ -1575,6 +1575,6 @@ static void beceem_protocol_reset(struct bcm_mini_adapter *Adapter)
 	for (i = 0; i < HiPriority; i++) {
 		/* resetting only the first size (S_MIBS_SERVICEFLOW_TABLE) for the SF. */
 		/* It is same between MIBs and SF. */
-		memset(&Adapter->PackInfo[i].stMibsExtServiceFlowTable, 0, sizeof(S_MIBS_EXTSERVICEFLOW_PARAMETERS));
+		memset(&Adapter->PackInfo[i].stMibsExtServiceFlowTable, 0, sizeof(struct bcm_mibs_parameters));
 	}
 }
diff --git a/trunk/drivers/staging/bcm/hostmibs.c b/trunk/drivers/staging/bcm/hostmibs.c
index 2fbe29c54331..051f223a8255 100644
--- a/trunk/drivers/staging/bcm/hostmibs.c
+++ b/trunk/drivers/staging/bcm/hostmibs.c
@@ -103,7 +103,7 @@ VOID GetDroppedAppCntrlPktMibs(struct bcm_host_stats_mibs *pstHostMibs, struct b
 
 VOID CopyMIBSExtendedSFParameters(struct bcm_mini_adapter *Adapter, struct bcm_connect_mgr_params *psfLocalSet, UINT uiSearchRuleIndex)
 {
-	S_MIBS_EXTSERVICEFLOW_PARAMETERS *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
+	struct bcm_mibs_parameters *t = &Adapter->PackInfo[uiSearchRuleIndex].stMibsExtServiceFlowTable;
 
 	t->wmanIfSfid = psfLocalSet->u32SFID;
 	t->wmanIfCmnCpsMaxSustainedRate = psfLocalSet->u32MaxSustainedTrafficRate;