Commit 963fa3e6 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman

Staging: bcm: Replace USHORT with unsigned short in Protocol.h

This patch replaces "USHORT" with "unsigned short"
in Protocol.h
Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a88304e
...@@ -40,16 +40,16 @@ typedef enum _E_NWPKT_ETHFRAME_TYPE { ...@@ -40,16 +40,16 @@ typedef enum _E_NWPKT_ETHFRAME_TYPE {
typedef struct _S_ETHCS_PKT_INFO { typedef struct _S_ETHCS_PKT_INFO {
E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType; E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType; E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
USHORT usEtherType; unsigned short usEtherType;
UCHAR ucDSAP; UCHAR ucDSAP;
} S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO; } S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO;
typedef struct _ETH_CS_802_Q_FRAME { typedef struct _ETH_CS_802_Q_FRAME {
struct bcm_eth_header EThHdr; struct bcm_eth_header EThHdr;
USHORT UserPriority:3; unsigned short UserPriority:3;
USHORT CFI:1; unsigned short CFI:1;
USHORT VLANID:12; unsigned short VLANID:12;
USHORT EthType; unsigned short EthType;
} __packed ETH_CS_802_Q_FRAME; } __packed ETH_CS_802_Q_FRAME;
typedef struct _ETH_CS_802_LLC_FRAME { typedef struct _ETH_CS_802_LLC_FRAME {
...@@ -111,15 +111,15 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_ { ...@@ -111,15 +111,15 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_ {
/* This is the format for the TCP packet header */ /* This is the format for the TCP packet header */
typedef struct _TCP_HEADER { typedef struct _TCP_HEADER {
USHORT usSrcPort; unsigned short usSrcPort;
USHORT usDestPort; unsigned short usDestPort;
ULONG ulSeqNumber; ULONG ulSeqNumber;
ULONG ulAckNumber; ULONG ulAckNumber;
UCHAR HeaderLength; UCHAR HeaderLength;
UCHAR ucFlags; UCHAR ucFlags;
USHORT usWindowsSize; unsigned short usWindowsSize;
USHORT usChkSum; unsigned short usChkSum;
USHORT usUrgetPtr; unsigned short usUrgetPtr;
} TCP_HEADER, *PTCP_HEADER; } TCP_HEADER, *PTCP_HEADER;
#define TCP_HEADER_LEN sizeof(TCP_HEADER) #define TCP_HEADER_LEN sizeof(TCP_HEADER)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment