diff options
| author |   Kevin McKinney <klmckinney1@gmail.com> | 2012-12-22 14:27:49 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:56:45 -0800 |
| commit | 30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e (patch) | |
| tree | a4121fbd2f0211745ce4e50315a2123a534a0201 /drivers/staging/bcm | |
| parent | Staging: bcm: Remove typedef for _E_SERVICEFLOW_CS_SPEC_ and call directly. (diff) | |
| download | linux-dev-30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e.tar.xz linux-dev-30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e.zip | |
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 <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/bcm')
| -rw-r--r-- | drivers/staging/bcm/Protocol.h | 4 | ||||
| -rw-r--r-- | 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; } } |