diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-12-22 14:27:47 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:56:45 -0800 |
| commit | 16c3f8b04c13a722aa82110bb982fe71f1d58918 (patch) | |
| tree | 77583360f344f7cbb91484cb632e2970eab3dcbe /drivers/staging/bcm | |
| parent | 57b49adaf1b10f45440b22487ca2027c0cb0a6c8 (diff) | |
Staging: bcm: Remove typedef for _TCP_HEADER and call directly.
This patch removes typedef for _TCP_HEADER, and changes
the name of the struct to bcm_tcp_header. In addition,
any calls to struct "TCP_HEADER, or *PTCP_HEADER" are
changed to call directly.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/bcm')
| -rw-r--r-- | drivers/staging/bcm/Protocol.h | 6 | ||||
| -rw-r--r-- | drivers/staging/bcm/Qos.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h index 51d11330705..b20d857fc14 100644 --- a/drivers/staging/bcm/Protocol.h +++ b/drivers/staging/bcm/Protocol.h @@ -110,7 +110,7 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_ { #define ARP_PKT_SIZE 60 /* This is the format for the TCP packet header */ -typedef struct _TCP_HEADER { +struct bcm_tcp_header { unsigned short usSrcPort; unsigned short usDestPort; unsigned long ulSeqNumber; @@ -120,9 +120,9 @@ typedef struct _TCP_HEADER { unsigned short usWindowsSize; unsigned short usChkSum; unsigned short usUrgetPtr; -} TCP_HEADER, *PTCP_HEADER; +}; -#define TCP_HEADER_LEN sizeof(TCP_HEADER) +#define TCP_HEADER_LEN sizeof(struct bcm_tcp_header) #define TCP_ACK 0x10 /* Bit 4 in tcpflags field. */ #define GET_TCP_HEADER_LEN(byte) ((byte&0xF0)>>4) diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index cde96a357db..438e73da332 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -454,7 +454,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) BOOLEAN bFragmentedPkt=FALSE,bClassificationSucceed=FALSE; USHORT usCurrFragment =0; - PTCP_HEADER pTcpHeader; + struct bcm_tcp_header *pTcpHeader; UCHAR IpHeaderLength; UCHAR TcpHeaderLength; @@ -614,7 +614,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) if((TCP == pIpHeader->protocol ) && !bFragmentedPkt && (ETH_AND_IP_HEADER_LEN + TCP_HEADER_LEN <= skb->len) ) { IpHeaderLength = pIpHeader->ihl; - pTcpHeader = (PTCP_HEADER)(((PUCHAR)pIpHeader)+(IpHeaderLength*4)); + pTcpHeader = (struct bcm_tcp_header *)(((PUCHAR)pIpHeader)+(IpHeaderLength*4)); TcpHeaderLength = GET_TCP_HEADER_LEN(pTcpHeader->HeaderLength); if((pTcpHeader->ucFlags & TCP_ACK) && |