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>

diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 723fe4b2d543d0cfc793c26bc688f41812e66afe..46eddbb771dd5546201a2ce797cb45d79dd0eade 100644 (file)
--- 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 f53c536cf5335ba38234cd6a130791f1b2086c68..942e1fb83f22994362c1f2a83408fe90b61383ad 100644 (file)
--- 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;