---

yaml --- r: 338202 b: refs/heads/master c: 0aaad65 h: refs/heads/master v: v3
git-mirror · Nov 27, 2012 · 96fc8d2 · 96fc8d2
1 parent 0f151de
commit 96fc8d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86758b7557d5c094b922c5b958886706576ee74a
+refs/heads/master: 0aaad65a63e17496f17a5769c2d1d2a0963316bb
diff --git a/trunk/drivers/staging/bcm/HostMIBSInterface.h b/trunk/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;