From 644f857fb51bd8fd6bc23d6cefcaff7c11666267 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Sat, 22 Dec 2012 14:27:51 -0500
Subject: [PATCH] --- yaml --- r: 353823 b: refs/heads/master c:
 620fac923c8a1aa53f6fd1e1e332c53415b56df8 h: refs/heads/master i:   353821:
 a84d024c8e279e7b9b93013646e1b327d49e836b   353819:
 949233baec77bf1fb88185a7c7f5a92e6926a37d   353815:
 1ea1be9fa210d584f7e1a4ee10131181b0eda3e4   353807:
 c44bbdcee46ec5b31810c6cb8b158796cfb1d56f   353791:
 f60c668283ba8d8ee2d85f265b72009731d86325 v: v3

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

diff --git a/[refs] b/[refs]
index 98a328f145b2..b1cd269de51f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bcacc2975d03ea5f952bfd71ac9c33726a1804e
+refs/heads/master: 620fac923c8a1aa53f6fd1e1e332c53415b56df8
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
index c9a242983418..842539d897bd 100644
--- a/trunk/drivers/staging/bcm/Protocol.h
+++ b/trunk/drivers/staging/bcm/Protocol.h
@@ -52,12 +52,12 @@ typedef struct _ETH_CS_802_Q_FRAME {
 	unsigned short EthType;
 } __packed ETH_CS_802_Q_FRAME;
 
-typedef struct _ETH_CS_802_LLC_FRAME {
+struct bcm_eth_llc_frame {
 	struct bcm_eth_header EThHdr;
 	unsigned char DSAP;
 	unsigned char SSAP;
 	unsigned char Control;
-} __packed ETH_CS_802_LLC_FRAME;
+} __packed;
 
 struct bcm_eth_llc_snap_frame {
 	struct bcm_eth_header EThHdr;
diff --git a/trunk/drivers/staging/bcm/Qos.c b/trunk/drivers/staging/bcm/Qos.c
index 2608aecb857a..d53151bd0482 100644
--- a/trunk/drivers/staging/bcm/Qos.c
+++ b/trunk/drivers/staging/bcm/Qos.c
@@ -467,7 +467,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
 		case eEth802LLCFrame:
 		{
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLCFrame\n");
-            pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_FRAME);
+			pIpHeader = pvEThPayload + sizeof(struct bcm_eth_llc_frame);
 			break;
 		}
 
@@ -830,8 +830,8 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
 		//802.2 LLC
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "802.2 LLC Frame \n");
 		pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCFrame;
-		pstEthCsPktInfo->ucDSAP = ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->DSAP;
-		if(pstEthCsPktInfo->ucDSAP == 0xAA && ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->SSAP == 0xAA)
+		pstEthCsPktInfo->ucDSAP = ((struct bcm_eth_llc_frame *)pvEthPayload)->DSAP;
+		if(pstEthCsPktInfo->ucDSAP == 0xAA && ((struct bcm_eth_llc_frame *)pvEthPayload)->SSAP == 0xAA)
 		{
 			//SNAP Frame
 			pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame;