diff --git a/[refs] b/[refs] index 080f0ac7683c..1a1c2e714987 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d69438df32834cf7f7da2294bce34e840244abf8 +refs/heads/master: 17d7fd271a13b72a0fe452c4a7992c65dc479b23 diff --git a/trunk/drivers/staging/bcm/IPv6Protocol.c b/trunk/drivers/staging/bcm/IPv6Protocol.c index 46eddbb771dd..04d1b2dc7f17 100644 --- a/trunk/drivers/staging/bcm/IPv6Protocol.c +++ b/trunk/drivers/staging/bcm/IPv6Protocol.c @@ -58,7 +58,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload, BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG, DBG_LVL_ALL, "\nIPv6 Fragmentation Header"); - usNextHeaderOffset += sizeof(IPV6FragmentHeader); + usNextHeaderOffset += sizeof(struct bcm_ipv6_fragment_hdr); } break; diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h index 942e1fb83f22..d3f471ae5abc 100644 --- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h +++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h @@ -39,12 +39,12 @@ typedef struct IPV6RoutingHeaderFormatTag { unsigned long ulReserved; } IPV6RoutingHeader; -typedef struct IPV6FragmentHeaderFormatTag { +struct bcm_ipv6_fragment_hdr { unsigned char ucNextHeader; unsigned char ucReserved; unsigned short usFragmentOffset; unsigned long ulIdentification; -} IPV6FragmentHeader; +}; struct bcm_ipv6_dest_options_hdr { unsigned char ucNextHeader;