Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353760
b: refs/heads/master
c: 5cc3dea
h: refs/heads/master
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent f7e10cf commit 03ddc2b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d83beb86f4aa32721e907fe4c5772a679f5a2a9a
refs/heads/master: 5cc3dead2a38ed465c99e6052e4756b4c2602f8b
21 changes: 6 additions & 15 deletions trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@

#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 struct IPV6HeaderFormatTag
{
UCHAR ucVersionPrio;
Expand All @@ -43,8 +39,6 @@ typedef struct IPV6RoutingHeaderFormatTag
UCHAR ucNumAddresses;
UCHAR ucNextAddress;
ULONG ulReserved;
//UCHAR aucAddressList[0];

} IPV6RoutingHeader;

typedef struct IPV6FragmentHeaderFormatTag
Expand All @@ -60,7 +54,6 @@ typedef struct IPV6DestOptionsHeaderFormatTag
UCHAR ucNextHeader;
UCHAR ucHdrExtLen;
UCHAR ucDestOptions[6];
//UCHAR udExtDestOptions[0];
} IPV6DestOptionsHeader;

typedef struct IPV6HopByHopOptionsHeaderFormatTag
Expand All @@ -76,15 +69,13 @@ typedef struct IPV6AuthenticationHeaderFormatTag
UCHAR ucLength;
USHORT usReserved;
ULONG ulSecurityParametersIndex;
//UCHAR ucAuthenticationData[0];
} IPV6AuthenticationHeader;

typedef struct IPV6IcmpHeaderFormatTag
{
UCHAR ucType;
UCHAR ucCode;
USHORT usChecksum;
//UCHAR ucIcmpMsg[0];
} IPV6IcmpHeader;

typedef enum _E_IPADDR_CONTEXT
Expand All @@ -93,10 +84,10 @@ typedef enum _E_IPADDR_CONTEXT
eDestIpAddress
} E_IPADDR_CONTEXT;

//Function Prototypes
/* Function Prototypes */

USHORT IpVersion6(struct bcm_mini_adapter *Adapter, /**< Pointer to the driver control structure */
PVOID pcIpHeader, /**<Pointer to the IP Hdr of the packet*/
USHORT 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);
Expand Down

0 comments on commit 03ddc2b

Please sign in to comment.