From: Kevin McKinney <klmckinney1@gmail.com>
Date: Mon, 26 Nov 2012 00:29:03 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for _U_MIBS_IP_ADDRESS and call directly.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0aaad65a63e17496f17a5769c2d1d2a0963316bb;p=linux-beck.git

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

This patch removes typedef for _U_MIBS_IP_ADDRESS, and
changes the name of the union to bcm_mibs_ip_addr.
In addition, any calls to typedef U_MIBS_IP_ADDRESS are
changed to call the union 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 355905e6c0a6..f922ac49b70e 100644
--- a/drivers/staging/bcm/HostMIBSInterface.h
+++ b/drivers/staging/bcm/HostMIBSInterface.h
@@ -20,7 +20,7 @@
 #define MIBS_MAX_HIST_ENTRIES		12
 #define MIBS_PKTSIZEHIST_RANGE		128
 
-typedef union _U_MIBS_IP_ADDRESS {
+union bcm_mibs_ip_addr {
 	struct {
 		/* Source Ip Address Range */
 		unsigned long ulIpv4Addr[MIBS_MAX_IP_RANGE_LENGTH];
@@ -41,7 +41,7 @@ typedef union _U_MIBS_IP_ADDRESS {
 		unsigned char ucIpv6Address[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
 		unsigned char ucIpv6Mask[MIBS_MAX_IP_RANGE_LENGTH * MIBS_IPV6_ADDRESS_SIZEINBYTES];
 	};
-} U_MIBS_IP_ADDRESS;
+};
 
 struct bcm_mibs_host_info {
 	u64	GoodTransmits;
@@ -71,10 +71,10 @@ struct bcm_mibs_classifier_rule {
 	bool	bUsed;
 	unsigned short	usVCID_Value;
 	u8	u8ClassifierRulePriority;
-	U_MIBS_IP_ADDRESS stSrcIpAddress;
+	union bcm_mibs_ip_addr stSrcIpAddress;
 	/* IP Source Address Length */
 	unsigned char	ucIPSourceAddressLength;
-	U_MIBS_IP_ADDRESS stDestIpAddress;
+	union bcm_mibs_ip_addr stDestIpAddress;
 	/* IP Destination Address Length */
 	unsigned char	ucIPDestinationAddressLength;
 	unsigned char	ucIPTypeOfServiceLength;