From: Kevin McKinney <klmckinney1@gmail.com>
Date: Tue, 11 Dec 2012 02:55:06 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for IPV6HopByHopOptionsHeaderFormatTag and call directly.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bc25b751537e9481bf41d2718969f9356e31fb4f;p=deliverable%2Flinux.git

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

This patch removes typedef IPV6HopByHopOptionsHeaderFormatTag,
and changes the name of the struct to bcm_ipv6_options_hdr.
In addition, any calls to typedef IPV6HopByHopOptionsHeader
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 f3ab390518cf..723fe4b2d543 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -38,7 +38,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL, "\nIPv6 HopByHop Header");
-			usNextHeaderOffset += sizeof(IPV6HopByHopOptionsHeader);
+			usNextHeaderOffset += sizeof(struct bcm_ipv6_options_hdr);
 		}
 		break;
 
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 1c49119cc477..f53c536cf533 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -52,11 +52,11 @@ typedef struct IPV6DestOptionsHeaderFormatTag {
 	unsigned char ucDestOptions[6];
 } IPV6DestOptionsHeader;
 
-typedef struct IPV6HopByHopOptionsHeaderFormatTag {
+struct bcm_ipv6_options_hdr {
 	unsigned char ucNextHeader;
 	unsigned char ucMisc[3];
 	unsigned long ulJumboPayloadLen;
-} IPV6HopByHopOptionsHeader;
+};
 
 struct bcm_ipv6_authentication_hdr {
 	unsigned char  ucNextHeader;