diff --git a/[refs] b/[refs]
index e02c623ed7de..26f10fdd76da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ceebf54d2edd1706ad3493f705ac7526fbbe55b4
+refs/heads/master: 5601bb9da56602a4faa387c9cc6b1bb929393de5
diff --git a/trunk/drivers/staging/bcm/IPv6Protocol.c b/trunk/drivers/staging/bcm/IPv6Protocol.c
index 4745ddd62f5b..f3ab390518cf 100644
--- a/trunk/drivers/staging/bcm/IPv6Protocol.c
+++ b/trunk/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/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
index 4ab3a6d37bb6..1c49119cc477 100644
--- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/trunk/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,