diff --git a/[refs] b/[refs]
index 7f429f9faf93..969640229405 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16806309fe6b4b6d8c1dd44e31f73e2d8d9f4658
+refs/heads/master: dbadab2684d47cc7e67a4f06a44f3120a5a59c3f
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
index 23ddc3d7c9ea..78335f972e84 100644
--- a/trunk/drivers/staging/bcm/CmHost.c
+++ b/trunk/drivers/staging/bcm/CmHost.c
@@ -113,7 +113,7 @@ static VOID deleteSFBySfid(struct bcm_mini_adapter *Adapter, UINT uiSearchRuleIn
 static inline VOID
 CopyIpAddrToClassifier(struct bcm_classifier_rule *pstClassifierEntry,
 		B_UINT8 u8IpAddressLen, B_UINT8 *pu8IpAddressMaskSrc,
-		BOOLEAN bIpVersion6, E_IPADDR_CONTEXT eIpAddrContext)
+		BOOLEAN bIpVersion6, enum bcm_ipaddr_context eIpAddrContext)
 {
 	int i = 0;
 	UINT nSizeOfIPAddressInBytes = IP_LENGTH_OF_ADDRESS;
diff --git a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
index a4d2f8482b1b..c319680fbf13 100644
--- a/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
+++ b/trunk/drivers/staging/bcm/IPv6ProtocolHdr.h
@@ -71,10 +71,10 @@ typedef struct IPV6IcmpHeaderFormatTag {
 	unsigned short usChecksum;
 } IPV6IcmpHeader;
 
-typedef enum _E_IPADDR_CONTEXT {
+enum bcm_ipaddr_context {
 	eSrcIpAddress,
 	eDestIpAddress
-} E_IPADDR_CONTEXT;
+};
 
 /* Function Prototypes */