From 30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Sat, 22 Dec 2012 14:27:49 -0500 Subject: [PATCH] Staging: bcm: Remove typedef for _ETH_CS_ETH2_FRAME and call directly. This patch removes typedef for _ETH_CS_ETH2_FRAME, and changes the name of the struct to bcm_ethernet2_frame. In addition, any calls to struct "ETH_CS_ETH2_FRAME" are changed to call directly. Signed-off-by: Kevin McKinney Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/Protocol.h | 4 ++-- drivers/staging/bcm/Qos.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h index 89246b1b0a68..79e3b249d5ae 100644 --- a/drivers/staging/bcm/Protocol.h +++ b/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/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 438e73da3328..11a365094dc2 100644 --- a/drivers/staging/bcm/Qos.c +++ b/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; } } -- 2.20.1