From 0e2f484e336ff43960bbcd1dd0db2e5d42da8421 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 22 Dec 2012 14:27:50 -0500
Subject: [PATCH] --- yaml --- r: 353822 b: refs/heads/master c:
 9bcacc2975d03ea5f952bfd71ac9c33726a1804e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b49ea64a5682..98a328f145b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e
+refs/heads/master: 9bcacc2975d03ea5f952bfd71ac9c33726a1804e
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
index 79e3b249d5ae..c9a242983418 100644
--- a/trunk/drivers/staging/bcm/Protocol.h
+++ b/trunk/drivers/staging/bcm/Protocol.h
@@ -59,14 +59,14 @@ typedef struct _ETH_CS_802_LLC_FRAME {
 	unsigned char Control;
 } __packed ETH_CS_802_LLC_FRAME;
 
-typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
+struct bcm_eth_llc_snap_frame {
 	struct bcm_eth_header EThHdr;
 	unsigned char DSAP;
 	unsigned char SSAP;
 	unsigned char Control;
 	unsigned char OUI[3];
 	unsigned short usEtherType;
-} __packed ETH_CS_802_LLC_SNAP_FRAME;
+} __packed;
 
 struct bcm_ethernet2_frame {
 	struct bcm_eth_header EThHdr;
diff --git a/trunk/drivers/staging/bcm/Qos.c b/trunk/drivers/staging/bcm/Qos.c
index 11a365094dc2..2608aecb857a 100644
--- a/trunk/drivers/staging/bcm/Qos.c
+++ b/trunk/drivers/staging/bcm/Qos.c
@@ -474,7 +474,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
 		case eEth802LLCSNAPFrame:
 		{
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLC SNAP Frame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME);
+			pIpHeader = pvEThPayload + sizeof(struct bcm_eth_llc_snap_frame);
 			break;
 		}
 		case eEth802QVLANFrame:
@@ -835,7 +835,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
 		{
 			//SNAP Frame
 			pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame;
-			u16Etype = ((ETH_CS_802_LLC_SNAP_FRAME*)pvEthPayload)->usEtherType;
+			u16Etype = ((struct bcm_eth_llc_snap_frame *)pvEthPayload)->usEtherType;
 		}
 	}
 	if(u16Etype == ETHERNET_FRAMETYPE_IPV4)