diff --git a/[refs] b/[refs]
index 26f10fdd76da..f4f737ddead6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5601bb9da56602a4faa387c9cc6b1bb929393de5
+refs/heads/master: bc25b751537e9481bf41d2718969f9356e31fb4f
diff --git a/trunk/drivers/staging/bcm/IPv6Protocol.c b/trunk/drivers/staging/bcm/IPv6Protocol.c
index f3ab390518cf..723fe4b2d543 100644
--- a/trunk/drivers/staging/bcm/IPv6Protocol.c
+++ b/trunk/drivers/staging/bcm/IPv6Protocol.c
@@ -38,7 +38,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL, "\nIPv6 HopByHop Header");
-			usNextHeaderOffset += sizeof(IPV6HopByHopOptionsHeader);
+			usNextHeaderOffset += sizeof(struct bcm_ipv6_options_hdr);
 		}
 		break;
 
diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
index 1c49119cc477..f53c536cf533 100644
--- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -52,11 +52,11 @@ typedef struct IPV6DestOptionsHeaderFormatTag {
 	unsigned char ucDestOptions[6];
 } IPV6DestOptionsHeader;
 
-typedef struct IPV6HopByHopOptionsHeaderFormatTag {
+struct bcm_ipv6_options_hdr {
 	unsigned char ucNextHeader;
 	unsigned char ucMisc[3];
 	unsigned long ulJumboPayloadLen;
-} IPV6HopByHopOptionsHeader;
+};
 
 struct bcm_ipv6_authentication_hdr {
 	unsigned char  ucNextHeader;