---

yaml --- r: 353774 b: refs/heads/master c: 8f0652c h: refs/heads/master v: v3
git-mirror · Jan 7, 2013 · e19abd1 · e19abd1
1 parent 1f9a635
commit e19abd1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17d7fd271a13b72a0fe452c4a7992c65dc479b23
+refs/heads/master: 8f0652c25559e6757a0258aa241a23c187494d5e
diff --git a/trunk/drivers/staging/bcm/IPv6Protocol.c b/trunk/drivers/staging/bcm/IPv6Protocol.c
@@ -44,11 +44,11 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
 
 	case IPV6HDR_TYPE_ROUTING:
 		{
-			IPV6RoutingHeader *pstIpv6RoutingHeader;
+			struct bcm_ipv6_routing_hdr *pstIpv6RoutingHeader;
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV6_DBG,
 					DBG_LVL_ALL, "\nIPv6 Routing Header");
-			pstIpv6RoutingHeader = (IPV6RoutingHeader *)pucPayloadPtr;
-			usNextHeaderOffset += sizeof(IPV6RoutingHeader);
+			pstIpv6RoutingHeader = (struct bcm_ipv6_routing_hdr *)pucPayloadPtr;
+			usNextHeaderOffset += sizeof(struct bcm_ipv6_routing_hdr);
 			usNextHeaderOffset += pstIpv6RoutingHeader->ucNumAddresses * IPV6_ADDRESS_SIZEINBYTES;
 
 		}

diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -31,13 +31,13 @@ typedef struct IPV6HeaderFormatTag {
 	unsigned long  ulDestIpAddress[4];
 } IPV6Header;
 
-typedef struct IPV6RoutingHeaderFormatTag {
+struct bcm_ipv6_routing_hdr {
 	unsigned char ucNextHeader;
 	unsigned char ucRoutingType;
 	unsigned char ucNumAddresses;
 	unsigned char ucNextAddress;
 	unsigned long ulReserved;
-} IPV6RoutingHeader;
+};
 
 struct bcm_ipv6_fragment_hdr {
 	unsigned char  ucNextHeader;