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

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

diff --git a/[refs] b/[refs]
index f62434bd5b09..ca0712e22060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3df56e1066f88f97a602de2182a9236b8464f41b
+refs/heads/master: 5f8797b64f62662f36814db36409720eac02a5a4
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
index 184d2154c657..bb62e1711565 100644
--- a/trunk/drivers/staging/bcm/Protocol.h
+++ b/trunk/drivers/staging/bcm/Protocol.h
@@ -20,7 +20,7 @@ struct TransportHeaderT {
 		struct udphdr uhdr;
 		struct tcphdr thdr;
 	};
-} __attribute__((packed));
+} __packed;
 typedef struct TransportHeaderT xporthdr;
 
 typedef enum _E_NWPKT_IPFRAME_TYPE {
@@ -50,14 +50,14 @@ typedef struct _ETH_CS_802_Q_FRAME {
 	USHORT CFI:1;
 	USHORT VLANID:12;
 	USHORT EthType;
-} __attribute__((packed)) ETH_CS_802_Q_FRAME;
+} __packed ETH_CS_802_Q_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;
+} __packed ETH_CS_802_LLC_FRAME;
 
 typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
 	struct bcm_eth_header EThHdr;
@@ -66,11 +66,11 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
 	unsigned char Control;
 	unsigned char OUI[3];
 	unsigned short usEtherType;
-} __attribute__((packed)) ETH_CS_802_LLC_SNAP_FRAME;
+} __packed ETH_CS_802_LLC_SNAP_FRAME;
 
 typedef struct _ETH_CS_ETH2_FRAME {
 	struct bcm_eth_header EThHdr;
-} __attribute__((packed)) ETH_CS_ETH2_FRAME;
+} __packed ETH_CS_ETH2_FRAME;
 
 #define ETHERNET_FRAMETYPE_IPV4		ntohs(0x0800)
 #define ETHERNET_FRAMETYPE_IPV6		ntohs(0x86dd)