---

yaml --- r: 353762 b: refs/heads/master c: 5ef43c3 h: refs/heads/master v: v3
git-mirror · Jan 7, 2013 · 41211bd · 41211bd
1 parent 4d178f7
commit 41211bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb379dae37ca215cf6fcafdbc3f3cdf5d44f4ab8
+refs/heads/master: 5ef43c3bf6f1d963e888275780281bfec79c4bad
diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -24,7 +24,7 @@
 typedef struct IPV6HeaderFormatTag {
 	UCHAR  ucVersionPrio;
 	UCHAR  aucFlowLabel[3];
-	USHORT usPayloadLength;
+	unsigned short usPayloadLength;
 	UCHAR  ucNextHeader;
 	UCHAR  ucHopLimit;
 	ULONG  ulSrcIpAddress[4];
@@ -42,7 +42,7 @@ typedef struct IPV6RoutingHeaderFormatTag {
 typedef struct IPV6FragmentHeaderFormatTag {
 	UCHAR  ucNextHeader;
 	UCHAR  ucReserved;
-	USHORT usFragmentOffset;
+	unsigned short usFragmentOffset;
 	ULONG  ulIdentification;
 } IPV6FragmentHeader;
 
@@ -61,14 +61,14 @@ typedef struct IPV6HopByHopOptionsHeaderFormatTag {
 typedef struct IPV6AuthenticationHeaderFormatTag {
 	UCHAR  ucNextHeader;
 	UCHAR  ucLength;
-	USHORT usReserved;
+	unsigned short usReserved;
 	ULONG  ulSecurityParametersIndex;
 } IPV6AuthenticationHeader;
 
 typedef struct IPV6IcmpHeaderFormatTag {
 	UCHAR  ucType;
 	UCHAR  ucCode;
-	USHORT usChecksum;
+	unsigned short usChecksum;
 } IPV6IcmpHeader;
 
 typedef enum _E_IPADDR_CONTEXT {
@@ -78,14 +78,14 @@ typedef enum _E_IPADDR_CONTEXT {
 
 /* Function Prototypes */
 
-USHORT IpVersion6(struct bcm_mini_adapter *Adapter, /* < Pointer to the driver control structure */
+unsigned short 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);
 
 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 MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short ushSrcPort);
+extern BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short ushSrcPort);
 extern BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucProtocol);
 
 #endif