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 <[email protected]> --- 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 89246b1..79e3b24 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 438e73d..11a3650 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; } } -- 1.7.9.5 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
