From 0530e31291fba68a402cbfe28ec84c8ddd8c4e46 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 22 Dec 2012 14:27:41 -0500
Subject: [PATCH] --- yaml --- r: 353813 b: refs/heads/master c:
 3df56e1066f88f97a602de2182a9236b8464f41b h: refs/heads/master i:   353811:
 8fe75753fafed0d172ce65bbe70ee8f2545ee2a1 v: v3

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

diff --git a/[refs] b/[refs]
index f1bcecd679de..f62434bd5b09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3489276ec02e0d3dbc6723f89041187d9a6cf76
+refs/heads/master: 3df56e1066f88f97a602de2182a9236b8464f41b
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
index 7803ce568253..184d2154c657 100644
--- a/trunk/drivers/staging/bcm/Protocol.h
+++ b/trunk/drivers/staging/bcm/Protocol.h
@@ -15,25 +15,21 @@ struct ArpHeader {
 	unsigned char ar_tip[4];	/* target IP address        */
 };
 
-struct TransportHeaderT
-{
-	union
-	{
+struct TransportHeaderT {
+	union {
 		struct udphdr uhdr;
 		struct tcphdr thdr;
 	};
 } __attribute__((packed));
 typedef struct TransportHeaderT xporthdr;
 
-typedef enum _E_NWPKT_IPFRAME_TYPE
-{
+typedef enum _E_NWPKT_IPFRAME_TYPE {
 	eNonIPPacket,
 	eIPv4Packet,
 	eIPv6Packet
 } E_NWPKT_IPFRAME_TYPE;
 
-typedef enum _E_NWPKT_ETHFRAME_TYPE
-{
+typedef enum _E_NWPKT_ETHFRAME_TYPE {
 	eEthUnsupportedFrame,
 	eEth802LLCFrame,
 	eEth802LLCSNAPFrame,
@@ -41,16 +37,14 @@ typedef enum _E_NWPKT_ETHFRAME_TYPE
 	eEthOtherFrame
 } E_NWPKT_ETHFRAME_TYPE;
 
-typedef struct _S_ETHCS_PKT_INFO
-{
+typedef struct _S_ETHCS_PKT_INFO {
 	E_NWPKT_IPFRAME_TYPE eNwpktIPFrameType;
 	E_NWPKT_ETHFRAME_TYPE eNwpktEthFrameType;
 	USHORT	usEtherType;
 	UCHAR	ucDSAP;
 } S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO;
 
-typedef struct _ETH_CS_802_Q_FRAME
-{
+typedef struct _ETH_CS_802_Q_FRAME {
 	struct bcm_eth_header EThHdr;
 	USHORT UserPriority:3;
 	USHORT CFI:1;
@@ -58,16 +52,14 @@ typedef struct _ETH_CS_802_Q_FRAME
 	USHORT EthType;
 } __attribute__((packed)) ETH_CS_802_Q_FRAME;
 
-typedef struct _ETH_CS_802_LLC_FRAME
-{
+typedef struct _ETH_CS_802_LLC_FRAME {
 	struct bcm_eth_header EThHdr;
 	unsigned char DSAP;
 	unsigned char SSAP;
 	unsigned char Control;
 } __attribute__((packed)) ETH_CS_802_LLC_FRAME;
 
-typedef struct _ETH_CS_802_LLC_SNAP_FRAME
-{
+typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
 	struct bcm_eth_header EThHdr;
 	unsigned char DSAP;
 	unsigned char SSAP;
@@ -76,8 +68,7 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME
 	unsigned short usEtherType;
 } __attribute__((packed)) ETH_CS_802_LLC_SNAP_FRAME;
 
-typedef struct _ETH_CS_ETH2_FRAME
-{
+typedef struct _ETH_CS_ETH2_FRAME {
 	struct bcm_eth_header EThHdr;
 } __attribute__((packed)) ETH_CS_ETH2_FRAME;
 
@@ -86,8 +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_
-{
+typedef enum _E_SERVICEFLOW_CS_SPEC_ {
 	eCSSpecUnspecified = 0,
 	eCSPacketIPV4,
 	eCSPacketIPV6,
@@ -120,8 +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
-{
+typedef struct _TCP_HEADER {
 	USHORT usSrcPort;
 	USHORT usDestPort;
 	ULONG  ulSeqNumber;