---

yaml
---
r: 353816
b: refs/heads/master
c: 963fa3e
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a88304e568e0c6176ebd85fc08d535a4f02a97a
+refs/heads/master: 963fa3e62969e59c66875091710b5ea4ac68b065

trunk/drivers/staging/bcm/Protocol.h

@@ -40,16 +40,16 @@ typedef enum _E_NWPKT_ETHFRAME_TYPE {
 typedef struct _S_ETHCS_PKT_INFO {
 	E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
 	E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
-	USHORT	usEtherType;
+	unsigned short	usEtherType;
 	UCHAR	ucDSAP;
 } S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO;
 
 typedef struct _ETH_CS_802_Q_FRAME {
 	struct bcm_eth_header EThHdr;
-	USHORT UserPriority:3;
-	USHORT CFI:1;
-	USHORT VLANID:12;
-	USHORT EthType;
+	unsigned short UserPriority:3;
+	unsigned short CFI:1;
+	unsigned short VLANID:12;
+	unsigned short EthType;
 } __packed ETH_CS_802_Q_FRAME;
 
 typedef struct _ETH_CS_802_LLC_FRAME {
@@ -111,15 +111,15 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_ {
 
 /* This is the format for the TCP packet header */
 typedef struct _TCP_HEADER {
-	USHORT usSrcPort;
-	USHORT usDestPort;
+	unsigned short usSrcPort;
+	unsigned short usDestPort;
 	ULONG  ulSeqNumber;
 	ULONG  ulAckNumber;
 	UCHAR  HeaderLength;
 	UCHAR  ucFlags;
-	USHORT usWindowsSize;
-	USHORT usChkSum;
-	USHORT usUrgetPtr;
+	unsigned short usWindowsSize;
+	unsigned short usChkSum;
+	unsigned short usUrgetPtr;
 } TCP_HEADER, *PTCP_HEADER;
 
 #define TCP_HEADER_LEN		sizeof(TCP_HEADER)