From: Kevin McKinney <klmckinney1@gmail.com>
Date: Tue, 11 Dec 2012 02:55:08 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for IPV6FragmentHeaderFormatTag and call directly.
X-Git-Tag: v3.9-rc1~127^2~689
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=17d7fd271a13b72a0fe452c4a7992c65dc479b23;p=~emulex%2Finfiniband.git

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

This patch removes typedef IPV6FragmentHeaderFormatTag,
and changes the name of the struct to bcm_ipv6_fragment_hdr.
In addition, any calls to typedef IPV6FragmentHeader
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 46eddbb771d..04d1b2dc7f1 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -58,7 +58,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL,
 					"\nIPv6 Fragmentation Header");
-			usNextHeaderOffset += sizeof(IPV6FragmentHeader);
+			usNextHeaderOffset += sizeof(struct bcm_ipv6_fragment_hdr);
 
 		}
 		break;
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 942e1fb83f2..d3f471ae5ab 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -39,12 +39,12 @@ typedef struct IPV6RoutingHeaderFormatTag {
 	unsigned long ulReserved;
 } IPV6RoutingHeader;
 
-typedef struct IPV6FragmentHeaderFormatTag {
+struct bcm_ipv6_fragment_hdr {
 	unsigned char  ucNextHeader;
 	unsigned char  ucReserved;
 	unsigned short usFragmentOffset;
 	unsigned long  ulIdentification;
-} IPV6FragmentHeader;
+};
 
 struct bcm_ipv6_dest_options_hdr {
 	unsigned char ucNextHeader;