diff options
| author | Kevin McKinney | 2012-12-22 20:27:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-01-07 19:56:54 +0100 |
| commit | d1b37925baf99a39a838c1832a6e8765a8af0ed7 (patch) | |
| tree | f85cf2a89269cf7be961021742c251486ab3f1b1 /drivers/staging/bcm | |
| parent | Staging: bcm: Remove typedef for _ETH_CS_802_LLC_FRAME and call directly. (diff) | |
| download | kernel-qcow2-linux-d1b37925baf99a39a838c1832a6e8765a8af0ed7.tar.gz kernel-qcow2-linux-d1b37925baf99a39a838c1832a6e8765a8af0ed7.tar.xz kernel-qcow2-linux-d1b37925baf99a39a838c1832a6e8765a8af0ed7.zip | |
Staging: bcm: Remove typedef for _ETH_CS_802_Q_FRAME and call directly.
This patch removes typedef for _ETH_CS_802_Q_FRAME, and
changes the name of the struct to bcm_eth_q_frame. In
addition, any calls to struct "ETH_CS_802_Q_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 842539d897bd..7f66065b45ba 100644 --- a/drivers/staging/bcm/Protocol.h +++ b/drivers/staging/bcm/Protocol.h @@ -44,13 +44,13 @@ typedef struct _S_ETHCS_PKT_INFO { unsigned char ucDSAP; } S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO; -typedef struct _ETH_CS_802_Q_FRAME { +struct bcm_eth_q_frame { struct bcm_eth_header EThHdr; unsigned short UserPriority:3; unsigned short CFI:1; unsigned short VLANID:12; unsigned short EthType; -} __packed ETH_CS_802_Q_FRAME; +} __packed; struct bcm_eth_llc_frame { struct bcm_eth_header EThHdr; diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index d53151bd0482..b5f33baddcbb 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -480,7 +480,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) case eEth802QVLANFrame: { BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802.1Q VLANFrame\n"); - pIpHeader = pvEThPayload + sizeof(ETH_CS_802_Q_FRAME); + pIpHeader = pvEThPayload + sizeof(struct bcm_eth_q_frame); break; } case eEthOtherFrame: @@ -815,7 +815,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, { //802.1Q VLAN Header pstEthCsPktInfo->eNwpktEthFrameType = eEth802QVLANFrame; - u16Etype = ((ETH_CS_802_Q_FRAME*)pvEthPayload)->EthType; + u16Etype = ((struct bcm_eth_q_frame *)pvEthPayload)->EthType; //((ETH_CS_802_Q_FRAME*)pvEthPayload)->UserPriority } else |