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

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

This patch removes typedef for IPV6AuthenticationHeaderFormatTag,
and changes the name of the struct to bcm_ipv6_authentication_hdr
In addition, any calls to typedef IPV6AuthenticationHeader, 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 4745ddd62f5b..f3ab390518cf 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -76,7 +76,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 		break;
 	case IPV6HDR_TYPE_AUTHENTICATION:
 		{
-			IPV6AuthenticationHeader *pstIpv6AuthHdr = (IPV6AuthenticationHeader *)pucPayloadPtr;
+			struct bcm_ipv6_authentication_hdr *pstIpv6AuthHdr = (struct bcm_ipv6_authentication_hdr *)pucPayloadPtr;
 			int nHdrLen = pstIpv6AuthHdr->ucLength;
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL,
diff --git a/drivers/staging/bcm/IPv6ProtocolHdr.h b/drivers/staging/bcm/IPv6ProtocolHdr.h
index 4ab3a6d37bb6..1c49119cc477 100644
--- a/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -58,12 +58,12 @@ typedef struct IPV6HopByHopOptionsHeaderFormatTag {
 	unsigned long ulJumboPayloadLen;
 } IPV6HopByHopOptionsHeader;
 
-typedef struct IPV6AuthenticationHeaderFormatTag {
+struct bcm_ipv6_authentication_hdr {
 	unsigned char  ucNextHeader;
 	unsigned char  ucLength;
 	unsigned short usReserved;
 	unsigned long  ulSecurityParametersIndex;
-} IPV6AuthenticationHeader;
+};
 
 enum bcm_ipaddr_context {
 	eSrcIpAddress,