diff --git a/[refs] b/[refs]
index f4f737ddead6..080f0ac7683c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc25b751537e9481bf41d2718969f9356e31fb4f
+refs/heads/master: d69438df32834cf7f7da2294bce34e840244abf8
diff --git a/trunk/drivers/staging/bcm/IPv6Protocol.c b/trunk/drivers/staging/bcm/IPv6Protocol.c
index 723fe4b2d543..46eddbb771dd 100644
--- a/trunk/drivers/staging/bcm/IPv6Protocol.c
+++ b/trunk/drivers/staging/bcm/IPv6Protocol.c
@@ -64,12 +64,12 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 		break;
 	case IPV6HDR_TYPE_DESTOPTS:
 		{
-			IPV6DestOptionsHeader *pstIpv6DestOptsHdr = (IPV6DestOptionsHeader *)pucPayloadPtr;
+			struct bcm_ipv6_dest_options_hdr *pstIpv6DestOptsHdr = (struct bcm_ipv6_dest_options_hdr *)pucPayloadPtr;
 			int nTotalOptions = pstIpv6DestOptsHdr->ucHdrExtLen;
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL,
 					"\nIPv6 DestOpts Header Header");
-			usNextHeaderOffset += sizeof(IPV6DestOptionsHeader);
+			usNextHeaderOffset += sizeof(struct bcm_ipv6_dest_options_hdr);
 			usNextHeaderOffset += nTotalOptions * IPV6_DESTOPTS_HDR_OPTIONSIZE ;
 
 		}
diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
index f53c536cf533..942e1fb83f22 100644
--- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -46,11 +46,11 @@ typedef struct IPV6FragmentHeaderFormatTag {
 	unsigned long  ulIdentification;
 } IPV6FragmentHeader;
 
-typedef struct IPV6DestOptionsHeaderFormatTag {
+struct bcm_ipv6_dest_options_hdr {
 	unsigned char ucNextHeader;
 	unsigned char ucHdrExtLen;
 	unsigned char ucDestOptions[6];
-} IPV6DestOptionsHeader;
+};
 
 struct bcm_ipv6_options_hdr {
 	unsigned char ucNextHeader;