---

yaml
---
r: 353819
b: refs/heads/master
c: 16c3f8b
h: refs/heads/master
i:
  353817: 2e9bc60
  353815: 1ea1be9
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57b49adaf1b10f45440b22487ca2027c0cb0a6c8
+refs/heads/master: 16c3f8b04c13a722aa82110bb982fe71f1d58918

trunk/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)
 

trunk/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) &&