summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/bcm/IPv6ProtocolHdr.h14
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