From 867e33913fc31ce0e4654c9b440cb0304f4a1d7d Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 22 Dec 2012 14:27:46 -0500
Subject: [PATCH] --- yaml --- r: 353818 b: refs/heads/master c:
 57b49adaf1b10f45440b22487ca2027c0cb0a6c8 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/bcm/Protocol.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1ea36a65116b..a278592afc33 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edb9ebb098e1f60ba1575ba171189ca38c039805
+refs/heads/master: 57b49adaf1b10f45440b22487ca2027c0cb0a6c8
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
index 7070ce69157c..51d11330705d 100644
--- a/trunk/drivers/staging/bcm/Protocol.h
+++ b/trunk/drivers/staging/bcm/Protocol.h
@@ -41,7 +41,7 @@ typedef struct _S_ETHCS_PKT_INFO {
 	E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
 	E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
 	unsigned short	usEtherType;
-	UCHAR	ucDSAP;
+	unsigned char	ucDSAP;
 } S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO;
 
 typedef struct _ETH_CS_802_Q_FRAME {
@@ -115,8 +115,8 @@ typedef struct _TCP_HEADER {
 	unsigned short usDestPort;
 	unsigned long  ulSeqNumber;
 	unsigned long  ulAckNumber;
-	UCHAR  HeaderLength;
-	UCHAR  ucFlags;
+	unsigned char  HeaderLength;
+	unsigned char  ucFlags;
 	unsigned short usWindowsSize;
 	unsigned short usChkSum;
 	unsigned short usUrgetPtr;