Commit 5cc3dead authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Properly format and remove comments as needed in IPv6ProtocolHdr.h 



This patch formats all comments and removes
them as needed.

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

drivers/staging/bcm/IPv6ProtocolHdr.h

+6 −15
Original line number Original line Diff line number Diff line
@@ -16,15 +16,11 @@ 




#define IPV6_MAX_CHAINEDHDR_BUFFBYTES 0x64

#define IPV6_MAX_CHAINEDHDR_BUFFBYTES 0x64

/*

/*

// Size of Dest Options field of Destinations Options Header

 * Size of Dest Options field of Destinations Options Header

// in bytes.

 * in bytes.

 */

 */

#define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8

#define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8





//typedef  unsigned char UCHAR;

//typedef  unsigned short USHORT;

//typedef  unsigned long int ULONG;



typedef struct IPV6HeaderFormatTag

typedef struct IPV6HeaderFormatTag

{

{

	UCHAR  ucVersionPrio;

	UCHAR  ucVersionPrio;
@@ -43,8 +39,6 @@ typedef struct IPV6RoutingHeaderFormatTag 
	UCHAR ucNumAddresses;

	UCHAR ucNumAddresses;

	UCHAR ucNextAddress;

	UCHAR ucNextAddress;

	ULONG ulReserved;

	ULONG ulReserved;

	//UCHAR aucAddressList[0];



} IPV6RoutingHeader;

} IPV6RoutingHeader;





typedef struct IPV6FragmentHeaderFormatTag

typedef struct IPV6FragmentHeaderFormatTag
@@ -60,7 +54,6 @@ typedef struct IPV6DestOptionsHeaderFormatTag 
	UCHAR ucNextHeader;

	UCHAR ucNextHeader;

	UCHAR ucHdrExtLen;

	UCHAR ucHdrExtLen;

	UCHAR ucDestOptions[6];

	UCHAR ucDestOptions[6];

	//UCHAR udExtDestOptions[0];

} IPV6DestOptionsHeader;

} IPV6DestOptionsHeader;





typedef struct IPV6HopByHopOptionsHeaderFormatTag

typedef struct IPV6HopByHopOptionsHeaderFormatTag
@@ -76,7 +69,6 @@ typedef struct IPV6AuthenticationHeaderFormatTag 
	UCHAR  ucLength;

	UCHAR  ucLength;

	USHORT usReserved;

	USHORT usReserved;

	ULONG  ulSecurityParametersIndex;

	ULONG  ulSecurityParametersIndex;

	//UCHAR  ucAuthenticationData[0];

} IPV6AuthenticationHeader;

} IPV6AuthenticationHeader;





typedef struct IPV6IcmpHeaderFormatTag

typedef struct IPV6IcmpHeaderFormatTag
@@ -84,7 +76,6 @@ typedef struct IPV6IcmpHeaderFormatTag 
	UCHAR  ucType;

	UCHAR  ucType;

	UCHAR  ucCode;

	UCHAR  ucCode;

	USHORT usChecksum;

	USHORT usChecksum;

	//UCHAR  ucIcmpMsg[0];

} IPV6IcmpHeader;

} IPV6IcmpHeader;





typedef enum _E_IPADDR_CONTEXT

typedef enum _E_IPADDR_CONTEXT
@@ -93,10 +84,10 @@ typedef enum _E_IPADDR_CONTEXT 
	eDestIpAddress

	eDestIpAddress

} E_IPADDR_CONTEXT;

} E_IPADDR_CONTEXT;





//Function Prototypes

/* Function Prototypes */





USHORT IpVersion6(struct bcm_mini_adapter *Adapter, /**< Pointer to the driver control structure */

USHORT 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);