Commit 828c1dd5 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Replace ULONG with unsigned long in IPv6ProtocolHdr.h 



This patch replaces "ULONG" with "unsigned long" in
IPv6ProtocolHdr.h.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ef43c3b

drivers/staging/bcm/IPv6ProtocolHdr.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -27,8 +27,8 @@ typedef struct IPV6HeaderFormatTag { 
	unsigned short usPayloadLength;

	unsigned short usPayloadLength;

	UCHAR  ucNextHeader;

	UCHAR  ucNextHeader;

	UCHAR  ucHopLimit;

	UCHAR  ucHopLimit;

	ULONG  ulSrcIpAddress[4];

	unsigned long  ulSrcIpAddress[4];

	ULONG  ulDestIpAddress[4];

	unsigned long  ulDestIpAddress[4];

} IPV6Header;

} IPV6Header;





typedef struct IPV6RoutingHeaderFormatTag {

typedef struct IPV6RoutingHeaderFormatTag {
@@ -36,14 +36,14 @@ typedef struct IPV6RoutingHeaderFormatTag { 
	UCHAR ucRoutingType;

	UCHAR ucRoutingType;

	UCHAR ucNumAddresses;

	UCHAR ucNumAddresses;

	UCHAR ucNextAddress;

	UCHAR ucNextAddress;

	ULONG ulReserved;

	unsigned long ulReserved;

} IPV6RoutingHeader;

} IPV6RoutingHeader;





typedef struct IPV6FragmentHeaderFormatTag {

typedef struct IPV6FragmentHeaderFormatTag {

	UCHAR  ucNextHeader;

	UCHAR  ucNextHeader;

	UCHAR  ucReserved;

	UCHAR  ucReserved;

	unsigned short usFragmentOffset;

	unsigned short usFragmentOffset;

	ULONG  ulIdentification;

	unsigned long  ulIdentification;

} IPV6FragmentHeader;

} IPV6FragmentHeader;





typedef struct IPV6DestOptionsHeaderFormatTag {

typedef struct IPV6DestOptionsHeaderFormatTag {
@@ -55,14 +55,14 @@ typedef struct IPV6DestOptionsHeaderFormatTag { 
typedef struct IPV6HopByHopOptionsHeaderFormatTag {

typedef struct IPV6HopByHopOptionsHeaderFormatTag {

	UCHAR ucNextHeader;

	UCHAR ucNextHeader;

	UCHAR ucMisc[3];

	UCHAR ucMisc[3];

	ULONG ulJumboPayloadLen;

	unsigned long ulJumboPayloadLen;

} IPV6HopByHopOptionsHeader;

} IPV6HopByHopOptionsHeader;





typedef struct IPV6AuthenticationHeaderFormatTag {

typedef struct IPV6AuthenticationHeaderFormatTag {

	UCHAR  ucNextHeader;

	UCHAR  ucNextHeader;

	UCHAR  ucLength;

	UCHAR  ucLength;

	unsigned short usReserved;

	unsigned short usReserved;

	ULONG  ulSecurityParametersIndex;

	unsigned long  ulSecurityParametersIndex;

} IPV6AuthenticationHeader;

} IPV6AuthenticationHeader;





typedef struct IPV6IcmpHeaderFormatTag {

typedef struct IPV6IcmpHeaderFormatTag {
@@ -82,7 +82,7 @@ unsigned short IpVersion6(struct bcm_mini_adapter *Adapter, /* < Pointer to the 
					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(unsigned long *puIpv6Address);





extern BOOLEAN MatchSrcPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short 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 MatchDestPort(struct bcm_classifier_rule *pstClassifierRule, unsigned short ushSrcPort);