From f7e10cfaf4f2740016411f0f55f0ca4af8bc231f Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Mon, 10 Dec 2012 21:54:54 -0500
Subject: [PATCH] --- yaml --- r: 353759 b: refs/heads/master c:
 d83beb86f4aa32721e907fe4c5772a679f5a2a9a h: refs/heads/master i:   353757:
 3c4f93e460f2af2a0955b37e083b1dda298e1ef2   353755:
 6119dc9667502cb2d6c10ae7d388d3d375829a71   353751:
 b1213980813651ae438bb654d9f5a9847e2fe4ba   353743:
 d138e6173c4ad057336ce8991b2ab8a75ee0d371   353727:
 d14938f6c62011f93c415ad8e08f751a5c975633 v: v3

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

diff --git a/[refs] b/[refs]
index e6e162f4490a..2191cb281722 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e5df051d44d9505c518831ff4522becd32384c7
+refs/heads/master: d83beb86f4aa32721e907fe4c5772a679f5a2a9a
diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
index 8ba88a5b081c..478cf3fcee79 100644
--- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -1,7 +1,6 @@
 #ifndef _IPV6_PROTOCOL_DEFINES_
 #define _IPV6_PROTOCOL_DEFINES_
 
-
 #define IPV6HDR_TYPE_HOPBYHOP 0x0
 #define IPV6HDR_TYPE_ROUTING 0x2B
 #define IPV6HDR_TYPE_FRAGMENTATION 0x2C
@@ -10,9 +9,8 @@
 #define IPV6HDR_TYPE_ENCRYPTEDSECURITYPAYLOAD 0x34
 #define MASK_IPV6_CS_SPEC 0x2
 
-
-#define TCP_HEADER_TYPE 0x6
-#define UDP_HEADER_TYPE 0x11
+#define TCP_HEADER_TYPE	0x6
+#define UDP_HEADER_TYPE	0x11
 #define IPV6_ICMP_HDR_TYPE 0x2
 #define IPV6_FLOWLABEL_BITOFFSET 9
 
@@ -36,7 +34,7 @@ typedef struct IPV6HeaderFormatTag
 	UCHAR  ucHopLimit;
 	ULONG  ulSrcIpAddress[4];
 	ULONG  ulDestIpAddress[4];
-}IPV6Header;
+} IPV6Header;
 
 typedef struct IPV6RoutingHeaderFormatTag
 {
@@ -47,15 +45,15 @@ typedef struct IPV6RoutingHeaderFormatTag
 	ULONG ulReserved;
 	//UCHAR aucAddressList[0];
 
-}IPV6RoutingHeader;
+} IPV6RoutingHeader;
 
 typedef struct IPV6FragmentHeaderFormatTag
 {
-	UCHAR ucNextHeader;
-	UCHAR ucReserved;
+	UCHAR  ucNextHeader;
+	UCHAR  ucReserved;
 	USHORT usFragmentOffset;
 	ULONG  ulIdentification;
-}IPV6FragmentHeader;
+} IPV6FragmentHeader;
 
 typedef struct IPV6DestOptionsHeaderFormatTag
 {
@@ -63,54 +61,48 @@ typedef struct IPV6DestOptionsHeaderFormatTag
 	UCHAR ucHdrExtLen;
 	UCHAR ucDestOptions[6];
 	//UCHAR udExtDestOptions[0];
-}IPV6DestOptionsHeader;
+} IPV6DestOptionsHeader;
 
 typedef struct IPV6HopByHopOptionsHeaderFormatTag
 {
 	UCHAR ucNextHeader;
 	UCHAR ucMisc[3];
 	ULONG ulJumboPayloadLen;
-}IPV6HopByHopOptionsHeader;
+} IPV6HopByHopOptionsHeader;
 
 typedef struct IPV6AuthenticationHeaderFormatTag
 {
-	UCHAR ucNextHeader;
-	UCHAR ucLength;
+	UCHAR  ucNextHeader;
+	UCHAR  ucLength;
 	USHORT usReserved;
 	ULONG  ulSecurityParametersIndex;
 	//UCHAR  ucAuthenticationData[0];
-
-}IPV6AuthenticationHeader;
+} IPV6AuthenticationHeader;
 
 typedef struct IPV6IcmpHeaderFormatTag
 {
-	UCHAR ucType;
-	UCHAR ucCode;
+	UCHAR  ucType;
+	UCHAR  ucCode;
 	USHORT usChecksum;
 	//UCHAR  ucIcmpMsg[0];
-
-}IPV6IcmpHeader;
+} IPV6IcmpHeader;
 
 typedef enum _E_IPADDR_CONTEXT
 {
 	eSrcIpAddress,
 	eDestIpAddress
-
-}E_IPADDR_CONTEXT;
-
-
+} E_IPADDR_CONTEXT;
 
 //Function Prototypes
 
-USHORT	IpVersion6(struct bcm_mini_adapter *Adapter, /**< Pointer to the driver control structure */
+USHORT IpVersion6(struct bcm_mini_adapter *Adapter, /**< Pointer to the driver control structure */
 					PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
-					struct bcm_classifier_rule *pstClassifierRule );
+					struct bcm_classifier_rule *pstClassifierRule);
 
 VOID DumpIpv6Address(ULONG *puIpv6Address);
 
-extern BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
-extern BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule,USHORT ushSrcPort);
-extern BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule,UCHAR ucProtocol);
-
+extern BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule, USHORT ushSrcPort);
+extern BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule, USHORT ushSrcPort);
+extern BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucProtocol);
 
 #endif