From: Pradheep <pradheep.sh@xxxxxxxxx> This patch fixes the errors and warnings of checkpatch,pl Signed-off-by: Pradheep Shrinivasan <pradheep.sh@xxxxxxxxx> --- drivers/staging/bcm/IPv6ProtocolHdr.h | 79 +++++++++++++------------------- 1 files changed, 32 insertions(+), 47 deletions(-) diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h index a0db5a1..a23653a 100644 --- a/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/drivers/staging/bcm/IPv6ProtocolHdr.h @@ -18,17 +18,16 @@ #define IPV6_MAX_CHAINEDHDR_BUFFBYTES 0x64 /* -// Size of Dest Options field of Destinations Options Header -// in bytes. +* Size of Dest Options field of Destinations Options Header +* in bytes. */ #define IPV6_DESTOPTS_HDR_OPTIONSIZE 0x8 -//typedef unsigned char UCHAR; -//typedef unsigned short USHORT; -//typedef unsigned long int ULONG; +/* typedef unsigned char UCHAR; */ +/* typedef unsigned short USHORT; */ +/* typedef unsigned long int ULONG; */ -typedef struct IPV6HeaderFormatTag -{ +typedef struct IPV6HeaderFormatTag { UCHAR ucVersionPrio; UCHAR aucFlowLabel[3]; USHORT usPayloadLength; @@ -36,81 +35,67 @@ typedef struct IPV6HeaderFormatTag UCHAR ucHopLimit; ULONG ulSrcIpAddress[4]; ULONG ulDestIpAddress[4]; -}IPV6Header; +} IPV6Header; -typedef struct IPV6RoutingHeaderFormatTag -{ +typedef struct IPV6RoutingHeaderFormatTag { UCHAR ucNextHeader; UCHAR ucRoutingType; UCHAR ucNumAddresses; UCHAR ucNextAddress; ULONG ulReserved; - //UCHAR aucAddressList[0]; + /* UCHAR aucAddressList[0]; */ +} IPV6RoutingHeader; -}IPV6RoutingHeader; - -typedef struct IPV6FragmentHeaderFormatTag -{ +typedef struct IPV6FragmentHeaderFormatTag { UCHAR ucNextHeader; UCHAR ucReserved; USHORT usFragmentOffset; ULONG ulIdentification; -}IPV6FragmentHeader; +} IPV6FragmentHeader; -typedef struct IPV6DestOptionsHeaderFormatTag -{ +typedef struct IPV6DestOptionsHeaderFormatTag { UCHAR ucNextHeader; UCHAR ucHdrExtLen; UCHAR ucDestOptions[6]; - //UCHAR udExtDestOptions[0]; -}IPV6DestOptionsHeader; + /* UCHAR udExtDestOptions[0]; */ +} IPV6DestOptionsHeader; -typedef struct IPV6HopByHopOptionsHeaderFormatTag -{ +typedef struct IPV6HopByHopOptionsHeaderFormatTag { UCHAR ucNextHeader; UCHAR ucMisc[3]; ULONG ulJumboPayloadLen; -}IPV6HopByHopOptionsHeader; +} IPV6HopByHopOptionsHeader; -typedef struct IPV6AuthenticationHeaderFormatTag -{ +typedef struct IPV6AuthenticationHeaderFormatTag { UCHAR ucNextHeader; UCHAR ucLength; USHORT usReserved; ULONG ulSecurityParametersIndex; - //UCHAR ucAuthenticationData[0]; - -}IPV6AuthenticationHeader; + /* UCHAR ucAuthenticationData[0]; */ +} IPV6AuthenticationHeader; -typedef struct IPV6IcmpHeaderFormatTag -{ +typedef struct IPV6IcmpHeaderFormatTag { UCHAR ucType; UCHAR ucCode; USHORT usChecksum; - //UCHAR ucIcmpMsg[0]; + /*UCHAR ucIcmpMsg[0]; */ +} IPV6IcmpHeader; -}IPV6IcmpHeader; - -typedef enum _E_IPADDR_CONTEXT -{ +typedef enum _E_IPADDR_CONTEXT { eSrcIpAddress, eDestIpAddress +} E_IPADDR_CONTEXT; -}E_IPADDR_CONTEXT; - - - -//Function Prototypes - -USHORT IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */ - PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/ - S_CLASSIFIER_RULE *pstClassifierRule ); +/* Function Prototypes */ +USHORT IpVersion6(PMINI_ADAPTER Adapter, /**< Pointer to the driver control structure */ + PVOID pcIpHeader,/**<Pointer to the IP Hdr of the packet */ + S_CLASSIFIER_RULE *pstClassifierRule); VOID DumpIpv6Address(ULONG *puIpv6Address); -extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort); -extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule,USHORT ushSrcPort); -extern BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule,UCHAR ucProtocol); +extern BOOLEAN MatchSrcPort(S_CLASSIFIER_RULE *pstClassifierRule, USHORT ushSrcPort); +extern BOOLEAN MatchDestPort(S_CLASSIFIER_RULE *pstClassifierRule, USHORT ushSrcPort); +extern BOOLEAN MatchProtocol(S_CLASSIFIER_RULE *pstClassifierRule, UCHAR ucProtocol); #endif -- 1.7.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel