From: Kevin McKinney <klmckinney1@gmail.com>
Date: Tue, 11 Dec 2012 02:55:09 +0000 (-0500)
Subject: Staging: bcm: Remove typedef for IPV6RoutingHeaderFormatTag and call directly.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8f0652c25559e6757a0258aa241a23c187494d5e;p=openwrt%2Fstaging%2Fblogic.git

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

This patch removes typedef IPV6RoutingHeaderFormatTag,
and changes the name of the struct to bcm_ipv6_routing_hdr.
In addition, any calls to typedef IPV6RoutingHeader
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 04d1b2dc7f17..03f1dd4e7b77 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -44,11 +44,11 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 
 	case IPV6HDR_TYPE_ROUTING:
 		{
-			IPV6RoutingHeader *pstIpv6RoutingHeader;
+			struct bcm_ipv6_routing_hdr *pstIpv6RoutingHeader;
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL, "\nIPv6 Routing Header");
-			pstIpv6RoutingHeader = (IPV6RoutingHeader *)pucPayloadPtr;
-			usNextHeaderOffset += sizeof(IPV6RoutingHeader);
+			pstIpv6RoutingHeader = (struct bcm_ipv6_routing_hdr *)pucPayloadPtr;
+			usNextHeaderOffset += sizeof(struct bcm_ipv6_routing_hdr);
 			usNextHeaderOffset += pstIpv6RoutingHeader->ucNumAddresses * IPV6_ADDRESS_SIZEINBYTES;
 
 		}
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index d3f471ae5abc..cdcfc34f5d3b 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -31,13 +31,13 @@ typedef struct IPV6HeaderFormatTag {
 	unsigned long  ulDestIpAddress[4];
 } IPV6Header;
 
-typedef struct IPV6RoutingHeaderFormatTag {
+struct bcm_ipv6_routing_hdr {
 	unsigned char ucNextHeader;
 	unsigned char ucRoutingType;
 	unsigned char ucNumAddresses;
 	unsigned char ucNextAddress;
 	unsigned long ulReserved;
-} IPV6RoutingHeader;
+};
 
 struct bcm_ipv6_fragment_hdr {
 	unsigned char  ucNextHeader;