diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-12-10 21:54:57 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:49:00 -0800 |
| commit | 5ef43c3bf6f1d963e888275780281bfec79c4bad (patch) | |
| tree | 8183ed892a21fcaf1f911fc0f8c37c889274747e | |
| parent | eb379dae37ca215cf6fcafdbc3f3cdf5d44f4ab8 (diff) | |
Staging: bcm: Replace USHORT with unsigned short in IPv6ProtocolHdr.h
This patch replace "USHORT" with "unsigned
short" in IPv6ProtocolHdr.h
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/bcm/IPv6ProtocolHdr.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h index ababafc9a4dd..2ce49ae26a48 100644 --- a/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/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 |