diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-12-22 14:27:50 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:56:46 -0800 |
| commit | 9bcacc2975d03ea5f952bfd71ac9c33726a1804e (patch) | |
| tree | 0bdf6d8169f972f02b7ff3b5c39992f630d6dba3 | |
| parent | 30f5b4c2e12be1a07fbd0286ebd8c97e14fa7f1e (diff) | |
Staging: bcm: Remove typedef for _ETH_CS_802_LLC_SNAP_FRAME and call directly.
This patch removes typedef for _ETH_CS_802_LLC_SNAP_FRAME, and
changes the name of the struct to bcm_eth_llc_snap_frame. In
addition, any calls to struct "ETH_CS_802_LLC_SNAP_FRAME" are
changed to call directly.
Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 79e3b249d5ae..c9a242983418 100644 --- a/drivers/staging/bcm/Protocol.h +++ b/drivers/staging/bcm/Protocol.h @@ -59,14 +59,14 @@ typedef struct _ETH_CS_802_LLC_FRAME { unsigned char Control; } __packed ETH_CS_802_LLC_FRAME; -typedef struct _ETH_CS_802_LLC_SNAP_FRAME { +struct bcm_eth_llc_snap_frame { struct bcm_eth_header EThHdr; unsigned char DSAP; unsigned char SSAP; unsigned char Control; unsigned char OUI[3]; unsigned short usEtherType; -} __packed ETH_CS_802_LLC_SNAP_FRAME; +} __packed; struct bcm_ethernet2_frame { struct bcm_eth_header EThHdr; diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 11a365094dc2..2608aecb857a 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -474,7 +474,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) case eEth802LLCSNAPFrame: { BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLC SNAP Frame\n"); - pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME); + pIpHeader = pvEThPayload + sizeof(struct bcm_eth_llc_snap_frame); break; } case eEth802QVLANFrame: @@ -835,7 +835,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, { //SNAP Frame pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame; - u16Etype = ((ETH_CS_802_LLC_SNAP_FRAME*)pvEthPayload)->usEtherType; + u16Etype = ((struct bcm_eth_llc_snap_frame *)pvEthPayload)->usEtherType; } } if(u16Etype == ETHERNET_FRAMETYPE_IPV4) |