diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-12-10 21:55:07 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:49:02 -0800 |
| commit | d69438df32834cf7f7da2294bce34e840244abf8 (patch) | |
| tree | 4ed2e425a5e964ae283b0dc67d9ea6113d573e61 | |
| parent | bc25b751537e9481bf41d2718969f9356e31fb4f (diff) | |
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: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/bcm/IPv6Protocol.c | 4 | ||||
| -rw-r--r-- | drivers/staging/bcm/IPv6ProtocolHdr.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c index 723fe4b2d543..46eddbb771dd 100644 --- a/drivers/staging/bcm/IPv6Protocol.c +++ b/drivers/staging/bcm/IPv6Protocol.c @@ -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 ; } diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h index f53c536cf533..942e1fb83f22 100644 --- a/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/drivers/staging/bcm/IPv6ProtocolHdr.h @@ -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; |