Commit 5ef43c3b authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

Staging: bcm: Replace USHORT with unsigned short in IPv6ProtocolHdr.h

This patch replace "USHORT" with "unsigned
short" in IPv6ProtocolHdr.h
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb379dae
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
typedef struct IPV6HeaderFormatTag { typedef struct IPV6HeaderFormatTag {
UCHAR ucVersionPrio; UCHAR ucVersionPrio;
UCHAR aucFlowLabel[3]; UCHAR aucFlowLabel[3];
USHORT usPayloadLength; unsigned short usPayloadLength;
UCHAR ucNextHeader; UCHAR ucNextHeader;
UCHAR ucHopLimit; UCHAR ucHopLimit;
ULONG ulSrcIpAddress[4]; ULONG ulSrcIpAddress[4];
...@@ -42,7 +42,7 @@ typedef struct IPV6RoutingHeaderFormatTag { ...@@ -42,7 +42,7 @@ typedef struct IPV6RoutingHeaderFormatTag {
typedef struct IPV6FragmentHeaderFormatTag { typedef struct IPV6FragmentHeaderFormatTag {
UCHAR ucNextHeader; UCHAR ucNextHeader;
UCHAR ucReserved; UCHAR ucReserved;
USHORT usFragmentOffset; unsigned short usFragmentOffset;
ULONG ulIdentification; ULONG ulIdentification;
} IPV6FragmentHeader; } IPV6FragmentHeader;
...@@ -61,14 +61,14 @@ typedef struct IPV6HopByHopOptionsHeaderFormatTag { ...@@ -61,14 +61,14 @@ typedef struct IPV6HopByHopOptionsHeaderFormatTag {
typedef struct IPV6AuthenticationHeaderFormatTag { typedef struct IPV6AuthenticationHeaderFormatTag {
UCHAR ucNextHeader; UCHAR ucNextHeader;
UCHAR ucLength; UCHAR ucLength;
USHORT usReserved; unsigned short usReserved;
ULONG ulSecurityParametersIndex; ULONG ulSecurityParametersIndex;
} IPV6AuthenticationHeader; } IPV6AuthenticationHeader;
typedef struct IPV6IcmpHeaderFormatTag { typedef struct IPV6IcmpHeaderFormatTag {
UCHAR ucType; UCHAR ucType;
UCHAR ucCode; UCHAR ucCode;
USHORT usChecksum; unsigned short usChecksum;
} IPV6IcmpHeader; } IPV6IcmpHeader;
typedef enum _E_IPADDR_CONTEXT { typedef enum _E_IPADDR_CONTEXT {
...@@ -78,14 +78,14 @@ typedef enum _E_IPADDR_CONTEXT { ...@@ -78,14 +78,14 @@ typedef enum _E_IPADDR_CONTEXT {
/* Function Prototypes */ /* 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 */ PVOID pcIpHeader, /* <Pointer to the IP Hdr of the packet */
struct bcm_classifier_rule *pstClassifierRule); struct bcm_classifier_rule *pstClassifierRule);
VOID DumpIpv6Address(ULONG *puIpv6Address); VOID DumpIpv6Address(ULONG *puIpv6Address);
extern BOOLEAN MatchSrcPort(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, USHORT ushSrcPort); extern BOOLEAN MatchDestPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short ushSrcPort);
extern BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucProtocol); extern BOOLEAN MatchProtocol(struct bcm_classifier_rule *pstClassifierRule, UCHAR ucProtocol);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment