From 680d1e94854b04e8640413c57cb3e6596a9a8296 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sun, 23 Sep 2012 23:07:17 -0400
Subject: [PATCH] --- yaml --- r: 325521 b: refs/heads/master c:
 4b0cb3cb3bf96fd22bc9c5b0de5a3751f18e8fb6 h: refs/heads/master i:   325519:
 e354b5216dfa5b1c6856c10b843a22764cf459de v: v3

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

diff --git a/[refs] b/[refs]
index 7d7adc3688a0..66b232fc55b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2a392c2bd1dde3e5b8391a23ca1df7ea3d5cec5
+refs/heads/master: 4b0cb3cb3bf96fd22bc9c5b0de5a3751f18e8fb6
diff --git a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
index f67cb6e2eaa7..990e809e9680 100644
--- a/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
+++ b/trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
@@ -34,12 +34,7 @@
 #define NUM_ETHERTYPE_BYTES		3
 #define NUM_IPV6_FLOWLABLE_BYTES	3
 
-/*
- * structure Definitions
- *
- * brief class cCPacketClassificationRule
- */
-struct _stCPacketClassificationRuleSI {
+struct bcm_packet_class_rules {
 	/* 16bit UserPriority Of The Service Flow */
 	B_UINT16 u16UserPriority;
 	/* 16bit VLANID Of The Service Flow */
@@ -96,7 +91,6 @@ struct _stCPacketClassificationRuleSI {
 	B_UINT8 u8ClassifierActionRule;
 	B_UINT16 u16ValidityBitMap;
 };
-typedef struct _stCPacketClassificationRuleSI CCPacketClassificationRuleSI, stCPacketClassificationRuleSI, *pstCPacketClassificationRuleSI;
 
 struct bcm_phs_rules {
 	/* 8bit PHS Index Of The Service Flow */
@@ -127,8 +121,8 @@ struct bcm_convergence_types {
 	B_UINT8 u8PhsDSCAction;
 	/* 16bit Padding */
 	B_UINT8 u8Padding[2];
-	/* brief class cCPacketClassificationRule */
-	stCPacketClassificationRuleSI cCPacketClassificationRule;
+	/* Packet classification rules structure */
+	struct bcm_packet_class_rules cCPacketClassificationRule;
 	/* Payload header suppression rules structure */
 	struct bcm_phs_rules cPhsRule;
 };