From fe20bff0deca0db9a858a9f4416d372bc18cdcb2 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 22 Dec 2012 14:27:48 -0500
Subject: [PATCH] --- yaml --- r: 353820 b: refs/heads/master c:
 4a19aaa7cb8f20be2ab66922b1c56b649c4a06cf h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 27daf6c7cb1f..de650828e1c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16c3f8b04c13a722aa82110bb982fe71f1d58918
+refs/heads/master: 4a19aaa7cb8f20be2ab66922b1c56b649c4a06cf
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
index b20d857fc146..89246b1b0a68 100644
--- a/trunk/drivers/staging/bcm/Protocol.h
+++ b/trunk/drivers/staging/bcm/Protocol.h
@@ -77,7 +77,7 @@ typedef struct _ETH_CS_ETH2_FRAME {
 #define ETHERNET_FRAMETYPE_802QVLAN	ntohs(0x8100)
 
 /* Per SF CS Specification Encodings */
-typedef enum _E_SERVICEFLOW_CS_SPEC_ {
+enum bcm_spec_encoding {
 	eCSSpecUnspecified = 0,
 	eCSPacketIPV4,
 	eCSPacketIPV6,
@@ -88,7 +88,7 @@ typedef enum _E_SERVICEFLOW_CS_SPEC_ {
 	eCSPacketIPV4Over802_1QVLAN,
 	eCSPacketIPV6Over802_1QVLAN,
 	eCSPacketUnsupported
-} E_SERVICEFLOW_CS_SPEC;
+};
 
 #define	IP6_HEADER_LEN		40
 #define IP_VERSION(byte)	(((byte&0xF0)>>4))