---

yaml --- r: 353821 b: refs/heads/master c: 30f5b4c h: refs/heads/master i: 353819: 949233b v: v3
git-mirror · Jan 7, 2013 · a84d024 · a84d024
1 parent fe20bff
commit a84d024
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: 4a19aaa7cb8f20be2ab66922b1c56b649c4a06cf
+refs/heads/master: 30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e
diff --git a/trunk/drivers/staging/bcm/Protocol.h b/trunk/drivers/staging/bcm/Protocol.h
@@ -68,9 +68,9 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME {
 	unsigned short usEtherType;
 } __packed ETH_CS_802_LLC_SNAP_FRAME;
 
-typedef struct _ETH_CS_ETH2_FRAME {
+struct bcm_ethernet2_frame {
 	struct bcm_eth_header EThHdr;
-} __packed ETH_CS_ETH2_FRAME;
+} __packed;
 
 #define ETHERNET_FRAMETYPE_IPV4		ntohs(0x0800)
 #define ETHERNET_FRAMETYPE_IPV6		ntohs(0x86dd)

diff --git a/trunk/drivers/staging/bcm/Qos.c b/trunk/drivers/staging/bcm/Qos.c
@@ -486,13 +486,13 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
 		case eEthOtherFrame:
 		{
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : ETH Other Frame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
+			pIpHeader = pvEThPayload + sizeof(struct bcm_ethernet2_frame);
 			break;
 		}
 		default:
 		{
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : Unrecognized ETH Frame\n");
-			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);
+			pIpHeader = pvEThPayload + sizeof(struct bcm_ethernet2_frame);
 			break;
 		}
 	}