From fa86538c176b006af190d199e8b1bb2942eb09e5 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 20 Dec 2012 00:31:24 -0500
Subject: [PATCH] --- yaml --- r: 353795 b: refs/heads/master c:
 3efa535669a63d10f9b1c5f17ee6014224cc2d26 h: refs/heads/master i:   353793:
 df0bdfbfe7476f08ab947aee5ee961452bf4bf54   353791:
 f60c668283ba8d8ee2d85f265b72009731d86325 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/bcm/PHSDefines.h | 28 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index ddc315e0d096..7b4e1a9c3bb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acd4ab258f5fc2a8942f5b96be6f7e2f9b4164f2
+refs/heads/master: 3efa535669a63d10f9b1c5f17ee6014224cc2d26
diff --git a/trunk/drivers/staging/bcm/PHSDefines.h b/trunk/drivers/staging/bcm/PHSDefines.h
index ec29ee7480eb..52033c47037d 100644
--- a/trunk/drivers/staging/bcm/PHSDefines.h
+++ b/trunk/drivers/staging/bcm/PHSDefines.h
@@ -38,16 +38,16 @@
 #define ERR_PHSRULE_MATCH_FAIL			0x809
 
 typedef struct _S_PHS_RULE {
-	B_UINT8	u8PHSI;
-	B_UINT8	u8PHSFLength;
-	B_UINT8	u8PHSF[MAX_PHS_LENGTHS];
-	B_UINT8	u8PHSMLength;
-	B_UINT8	u8PHSM[MAX_PHS_LENGTHS];
-	B_UINT8	u8PHSS;
-	B_UINT8	u8PHSV;
-	B_UINT8	u8RefCnt;
-	B_UINT8	bUnclassifiedPHSRule;
-	B_UINT8	u8Reserved[3];
+	u8 u8PHSI;
+	u8 u8PHSFLength;
+	u8 u8PHSF[MAX_PHS_LENGTHS];
+	u8 u8PHSMLength;
+	u8 u8PHSM[MAX_PHS_LENGTHS];
+	u8 u8PHSS;
+	u8 u8PHSV;
+	u8 u8RefCnt;
+	u8 bUnclassifiedPHSRule;
+	u8 u8Reserved[3];
 	LONG	PHSModifiedBytes;
 	ULONG	PHSModifiedNumPackets;
 	ULONG	PHSErrorNumPackets;
@@ -59,11 +59,11 @@ typedef enum _E_CLASSIFIER_ENTRY_CONTEXT {
 } E_CLASSIFIER_ENTRY_CONTEXT;
 
 typedef struct _S_CLASSIFIER_ENTRY {
-	B_UINT8  bUsed;
+	u8  bUsed;
 	B_UINT16 uiClassifierRuleId;
-	B_UINT8  u8PHSI;
+	u8  u8PHSI;
 	S_PHS_RULE *pstPhsRule;
-	B_UINT8  bUnclassifiedPHSRule;
+	u8  bUnclassifiedPHSRule;
 } S_CLASSIFIER_ENTRY;
 
 typedef struct _S_CLASSIFIER_TABLE {
@@ -74,7 +74,7 @@ typedef struct _S_CLASSIFIER_TABLE {
 } S_CLASSIFIER_TABLE;
 
 typedef struct _S_SERVICEFLOW_ENTRY {
-	B_UINT8  bUsed;
+	u8  bUsed;
 	B_UINT16 uiVcid;
 	S_CLASSIFIER_TABLE  *pstClassifierTable;
 } S_SERVICEFLOW_ENTRY;