diff --git a/[refs] b/[refs]
index af1a8229c82f..be1680fc27c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36e0ae29141df4f531bbf5de103443da9c64bca6
+refs/heads/master: 7d5691e5ce814b43c08d5d5701c73346de4d1356
diff --git a/trunk/drivers/staging/bcm/HostMIBSInterface.h b/trunk/drivers/staging/bcm/HostMIBSInterface.h
index 27762fd88bf0..7d09b3e9f892 100644
--- a/trunk/drivers/staging/bcm/HostMIBSInterface.h
+++ b/trunk/drivers/staging/bcm/HostMIBSInterface.h
@@ -69,7 +69,7 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
 	unsigned char	ucReserved[2];
 	u16	uiClassifierRuleIndex;
 	BOOLEAN	bUsed;
-	USHORT	usVCID_Value;
+	unsigned short	usVCID_Value;
 	u8	u8ClassifierRulePriority;
 	U_MIBS_IP_ADDRESS stSrcIpAddress;
 	/* IP Source Address Length */
@@ -83,11 +83,11 @@ typedef struct _S_MIBS_CLASSIFIER_RULE {
 	unsigned char	ucTosMask;
 	unsigned char	ucProtocolLength;
 	unsigned char	ucProtocol[MIBS_MAX_PROTOCOL_LENGTH];
-	USHORT	usSrcPortRangeLo[MIBS_MAX_PORT_RANGE];
-	USHORT	usSrcPortRangeHi[MIBS_MAX_PORT_RANGE];
+	unsigned short	usSrcPortRangeLo[MIBS_MAX_PORT_RANGE];
+	unsigned short	usSrcPortRangeHi[MIBS_MAX_PORT_RANGE];
 	unsigned char	ucSrcPortRangeLength;
-	USHORT	usDestPortRangeLo[MIBS_MAX_PORT_RANGE];
-	USHORT	usDestPortRangeHi[MIBS_MAX_PORT_RANGE];
+	unsigned short	usDestPortRangeLo[MIBS_MAX_PORT_RANGE];
+	unsigned short	usDestPortRangeHi[MIBS_MAX_PORT_RANGE];
 	unsigned char	ucDestPortRangeLength;
 	BOOLEAN	bProtocolValid;
 	BOOLEAN	bTOSValid;
@@ -139,7 +139,7 @@ typedef struct _S_MIBS_EXTSERVICEFLOW_PARAMETERS {
 
 typedef struct _S_MIBS_SERVICEFLOW_TABLE {
 	unsigned long	ulSFID;
-	USHORT	usVCID_Value;
+	unsigned short	usVCID_Value;
 	unsigned int	uiThreshold;
 	u8	u8TrafficPriority;
 	BOOLEAN	bValid;
@@ -162,7 +162,7 @@ typedef struct _S_MIBS_SERVICEFLOW_TABLE {
 	unsigned int	uiMaxAllowedRate;
 	unsigned int	NumOfPacketsSent;
 	unsigned char ucDirection;
-	USHORT	usCID;
+	unsigned short	usCID;
 	S_MIBS_EXTSERVICEFLOW_PARAMETERS stMibsExtServiceFlowTable;
 	unsigned int	uiCurrentRxRate;
 	unsigned int	uiThisPeriodRxBytes;