From: Kevin McKinney <klmckinney1@gmail.com>
Date: Mon, 26 Nov 2012 00:28:59 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for _S_MIBS_EXTSERVICEFLOW_PARAMETERS and call directly.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8c7d51a3e83cfd508e7e766177be57ec7c829f54;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Staging: bcm: Remove typedef for _S_MIBS_EXTSERVICEFLOW_PARAMETERS and call directly.

This patch removes typedef for _S_MIBS_EXTSERVICEFLOW_PARAMETERS,
and changes the name of the struct to bcm_mibs_parameters. In
addition, any calls to typedef S_MIBS_EXTSERVICEFLOW_PARAMETERS
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 15e88380da43..f57794827f73 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/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/drivers/staging/bcm/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 0698ce04e8fb..a09e3540fde2 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/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/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index 9e9a93627dd9..c92078e7fe86 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/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/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 2fbe29c54331..051f223a8255 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/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;