From: Kevin McKinney <klmckinney1@gmail.com>
Date: Mon, 26 Nov 2012 00:29:01 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for _S_MIBS_CLASSIFIER_RULE and call directly.
X-Git-Tag: v3.8-rc1~178^2~113
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4aca284f1a0d0b86a0105558a2599937ee32a5b7;p=uclinux-h8%2Flinux.git

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

This patch removes typedef for _S_MIBS_CLASSIFIER_RULE, and
changes the name of the struct to bcm_mibs_classifier_rule.
In addition, any calls to typedef S_MIBS_CLASSIFIER_RULE 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/HostMIBSInterface.h b/drivers/staging/bcm/HostMIBSInterface.h
index 97d8ee5fa5fb..d803ff12f568 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -64,7 +64,7 @@ typedef struct _S_MIBS_HOST_INFO {
 	u32	aRxPktSizeHist[MIBS_MAX_HIST_ENTRIES];
 } S_MIBS_HOST_INFO;
 
-typedef struct _S_MIBS_CLASSIFIER_RULE {
+struct bcm_mibs_classifier_rule {
 	unsigned long	ulSFID;
 	unsigned char	ucReserved[2];
 	u16	uiClassifierRuleIndex;
@@ -96,7 +96,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
 	unsigned char	ucDirection;
 	bool	bIpv6Protocol;
 	u32	u32PHSRuleID;
-} S_MIBS_CLASSIFIER_RULE;
+};
 
 struct bcm_mibs_phs_rule {
 	unsigned long	ulSFID;
@@ -183,7 +183,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];
+	struct bcm_mibs_classifier_rule astClassifierTable[MIBS_MAX_CLASSIFIERS];
 	struct bcm_mibs_table	astSFtable[MIBS_MAX_SERVICEFLOWS];
 	struct bcm_mibs_phs_rule astPhsRulesTable[MIBS_MAX_PHSRULES];
 	struct bcm_mibs_dropped_cntrl_msg stDroppedAppCntrlMsgs;
diff --git a/drivers/staging/bcm/hostmibs.c b/drivers/staging/bcm/hostmibs.c
index 051f223a8255..3c5f4a5f0376 100644
--- a/drivers/staging/bcm/hostmibs.c
+++ b/drivers/staging/bcm/hostmibs.c
@@ -31,7 +31,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m
 			       astClassifierTable[nClassifierIndex],
 			       (PVOID) & Adapter->
 			       astClassifierTable[nClassifierIndex],
-			       sizeof(S_MIBS_CLASSIFIER_RULE));
+			       sizeof(struct bcm_mibs_classifier_rule));
 	}
 
 	/* Copy the SF Table */