---

yaml --- r: 353824 b: refs/heads/master c: d1b3792 h: refs/heads/master v: v3
git-mirror · Jan 7, 2013 · 5f98cf4 · 5f98cf4
1 parent 644f857
commit 5f98cf4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 620fac923c8a1aa53f6fd1e1e332c53415b56df8
+refs/heads/master: d1b37925baf99a39a838c1832a6e8765a8af0ed7
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
@@ -44,13 +44,13 @@ typedef struct _S_ETHCS_PKT_INFO {
 	unsigned char	ucDSAP;
 } S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO;
 
-typedef struct _ETH_CS_802_Q_FRAME {
+struct bcm_eth_q_frame {
 	struct bcm_eth_header EThHdr;
 	unsigned short UserPriority:3;
 	unsigned short CFI:1;
 	unsigned short VLANID:12;
 	unsigned short EthType;
-} __packed ETH_CS_802_Q_FRAME;
+} __packed;
 
 struct bcm_eth_llc_frame {
 	struct bcm_eth_header EThHdr;

diff --git a/trunk/drivers/staging/bcm/Qos.c b/trunk/drivers/staging/bcm/Qos.c
@@ -480,7 +480,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
 		case eEth802QVLANFrame:
 		{
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802.1Q VLANFrame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_Q_FRAME);
+			pIpHeader = pvEThPayload + sizeof(struct bcm_eth_q_frame);
 			break;
 		}
 		case eEthOtherFrame:
@@ -815,7 +815,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
 		{
 			//802.1Q VLAN Header
 			pstEthCsPktInfo->eNwpktEthFrameType = eEth802QVLANFrame;
-			u16Etype = ((ETH_CS_802_Q_FRAME*)pvEthPayload)->EthType;
+			u16Etype = ((struct bcm_eth_q_frame *)pvEthPayload)->EthType;
 			//((ETH_CS_802_Q_FRAME*)pvEthPayload)->UserPriority
 		}
 		else