From 0c784a8511ec30c90e183348cc69db812f5e0abf Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Mon, 10 Dec 2012 21:54:58 -0500
Subject: [PATCH] --- yaml --- r: 353763 b: refs/heads/master c:
 828c1dd5deeea44b801b3f0951ed08b7470f8240 h: refs/heads/master i:   353761:
 4d178f7ca578b6ab8d3ed3438a8a324fee6a75fc   353759:
 f7e10cfaf4f2740016411f0f55f0ca4af8bc231f v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/bcm/IPv6ProtocolHdr.h | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 044d7cb22bbf..9ab0f2184002 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ef43c3bf6f1d963e888275780281bfec79c4bad
+refs/heads/master: 828c1dd5deeea44b801b3f0951ed08b7470f8240
diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
index 2ce49ae26a48..5bbe4efc95f7 100644
--- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -27,8 +27,8 @@ typedef struct IPV6HeaderFormatTag {
 	unsigned short usPayloadLength;
 	UCHAR  ucNextHeader;
 	UCHAR  ucHopLimit;
-	ULONG  ulSrcIpAddress[4];
-	ULONG  ulDestIpAddress[4];
+	unsigned long  ulSrcIpAddress[4];
+	unsigned long  ulDestIpAddress[4];
 } IPV6Header;
 
 typedef struct IPV6RoutingHeaderFormatTag {
@@ -36,14 +36,14 @@ typedef struct IPV6RoutingHeaderFormatTag {
 	UCHAR ucRoutingType;
 	UCHAR ucNumAddresses;
 	UCHAR ucNextAddress;
-	ULONG ulReserved;
+	unsigned long ulReserved;
 } IPV6RoutingHeader;
 
 typedef struct IPV6FragmentHeaderFormatTag {
 	UCHAR  ucNextHeader;
 	UCHAR  ucReserved;
 	unsigned short usFragmentOffset;
-	ULONG  ulIdentification;
+	unsigned long  ulIdentification;
 } IPV6FragmentHeader;
 
 typedef struct IPV6DestOptionsHeaderFormatTag {
@@ -55,14 +55,14 @@ typedef struct IPV6DestOptionsHeaderFormatTag {
 typedef struct IPV6HopByHopOptionsHeaderFormatTag {
 	UCHAR ucNextHeader;
 	UCHAR ucMisc[3];
-	ULONG ulJumboPayloadLen;
+	unsigned long ulJumboPayloadLen;
 } IPV6HopByHopOptionsHeader;
 
 typedef struct IPV6AuthenticationHeaderFormatTag {
 	UCHAR  ucNextHeader;
 	UCHAR  ucLength;
 	unsigned short usReserved;
-	ULONG  ulSecurityParametersIndex;
+	unsigned long  ulSecurityParametersIndex;
 } IPV6AuthenticationHeader;
 
 typedef struct IPV6IcmpHeaderFormatTag {
@@ -82,7 +82,7 @@ unsigned short IpVersion6(struct bcm_mini_adapter *Adapter, /* < Pointer to the
 					PVOID pcIpHeader, /* <Pointer to the IP Hdr of the packet */
 					struct bcm_classifier_rule *pstClassifierRule);
 
-VOID DumpIpv6Address(ULONG *puIpv6Address);
+VOID DumpIpv6Address(unsigned long *puIpv6Address);
 
 extern BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short ushSrcPort);
 extern BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short ushSrcPort);