Commit d69438df authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

Staging: bcm: Remove typedef for IPV6DestOptionsHeaderFormatTag and call directly.

This patch removes typedef IPV6DestOptionsHeaderFormatTag,
and changes the name of the struct to bcm_ipv6_dest_options_hdr.
In addition, any calls to typedef IPV6DestOptionsHeader
are changed to call the struct directly.
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc25b751
...@@ -64,12 +64,12 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload, ...@@ -64,12 +64,12 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
break; break;
case IPV6HDR_TYPE_DESTOPTS: case IPV6HDR_TYPE_DESTOPTS:
{ {
IPV6DestOptionsHeader *pstIpv6DestOptsHdr = (IPV6DestOptionsHeader *)pucPayloadPtr; struct bcm_ipv6_dest_options_hdr *pstIpv6DestOptsHdr = (struct bcm_ipv6_dest_options_hdr *)pucPayloadPtr;
int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen; int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
DBG_LVL_ALL, DBG_LVL_ALL,
"\nIPv6 DestOpts Header Header"); "\nIPv6 DestOpts Header Header");
usNextHeaderOffset += sizeof(IPV6DestOptionsHeader); usNextHeaderOffset += sizeof(struct bcm_ipv6_dest_options_hdr);
usNextHeaderOffset += nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ; usNextHeaderOffset += nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ;
} }
......
...@@ -46,11 +46,11 @@ typedef struct IPV6FragmentHeaderFormatTag { ...@@ -46,11 +46,11 @@ typedef struct IPV6FragmentHeaderFormatTag {
unsigned long ulIdentification; unsigned long ulIdentification;
} IPV6FragmentHeader; } IPV6FragmentHeader;
typedef struct IPV6DestOptionsHeaderFormatTag { struct bcm_ipv6_dest_options_hdr {
unsigned char ucNextHeader; unsigned char ucNextHeader;
unsigned char ucHdrExtLen; unsigned char ucHdrExtLen;
unsigned char ucDestOptions[6]; unsigned char ucDestOptions[6];
} IPV6DestOptionsHeader; };
struct bcm_ipv6_options_hdr { struct bcm_ipv6_options_hdr {
unsigned char ucNextHeader; unsigned char ucNextHeader;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment