Skip to content

Commit

Permalink
Staging: bcm: Remove typedef for IPV6DestOptionsHeaderFormatTag and c…
Browse files Browse the repository at this point in the history
…all 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: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent bc25b75 commit d69438d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/bcm/IPv6Protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
break;
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;
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
DBG_LVL_ALL,
"\nIPv6 DestOpts Header Header");
usNextHeaderOffset += sizeof(IPV6DestOptionsHeader);
usNextHeaderOffset += sizeof(struct bcm_ipv6_dest_options_hdr);
usNextHeaderOffset += nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ;

}
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/bcm/IPv6ProtocolHdr.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ typedef struct IPV6FragmentHeaderFormatTag {
unsigned long ulIdentification;
} IPV6FragmentHeader;

typedef struct IPV6DestOptionsHeaderFormatTag {
struct bcm_ipv6_dest_options_hdr {
unsigned char ucNextHeader;
unsigned char ucHdrExtLen;
unsigned char ucDestOptions[6];
} IPV6DestOptionsHeader;
};

struct bcm_ipv6_options_hdr {
unsigned char ucNextHeader;
Expand Down

0 comments on commit d69438d

Please sign in to comment.