diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2012-12-22 14:27:51 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 10:56:51 -0800 |
| commit | 620fac923c8a1aa53f6fd1e1e332c53415b56df8 (patch) | |
| tree | 6d4a2212a5778c46c24c20dda60ee311c0c25495 /drivers | |
| parent | 9bcacc2975d03ea5f952bfd71ac9c33726a1804e (diff) | |
| download | linux-stable-620fac923c8a1aa53f6fd1e1e332c53415b56df8.tar.gz linux-stable-620fac923c8a1aa53f6fd1e1e332c53415b56df8.tar.bz2 linux-stable-620fac923c8a1aa53f6fd1e1e332c53415b56df8.zip | |
Staging: bcm: Remove typedef for _ETH_CS_802_LLC_FRAME and call directly.
This patch removes typedef for _ETH_CS_802_LLC_FRAME, and
changes the name of the struct to bcm_eth_llc_frame. In
addition, any calls to struct "ETH_CS_802_LLC_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')
| -rw-r--r-- | drivers/staging/bcm/Protocol.h | 4 | ||||
| -rw-r--r-- | drivers/staging/bcm/Qos.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/bcm/Protocol.h b/drivers/staging/bcm/Protocol.h index c9a242983418..842539d897bd 100644 --- a/drivers/staging/bcm/Protocol.h +++ b/drivers/staging/bcm/Protocol.h @@ -52,12 +52,12 @@ typedef struct _ETH_CS_802_Q_FRAME { unsigned short EthType; } __packed ETH_CS_802_Q_FRAME; -typedef struct _ETH_CS_802_LLC_FRAME { +struct bcm_eth_llc_frame { struct bcm_eth_header EThHdr; unsigned char DSAP; unsigned char SSAP; unsigned char Control; -} __packed ETH_CS_802_LLC_FRAME; +} __packed; struct bcm_eth_llc_snap_frame { struct bcm_eth_header EThHdr; diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 2608aecb857a..d53151bd0482 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -467,7 +467,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) case eEth802LLCFrame: { BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLCFrame\n"); - pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_FRAME); + pIpHeader = pvEThPayload + sizeof(struct bcm_eth_llc_frame); break; } @@ -830,8 +830,8 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, //802.2 LLC BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "802.2 LLC Frame \n"); pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCFrame; - pstEthCsPktInfo->ucDSAP = ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->DSAP; - if(pstEthCsPktInfo->ucDSAP == 0xAA && ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->SSAP == 0xAA) + pstEthCsPktInfo->ucDSAP = ((struct bcm_eth_llc_frame *)pvEthPayload)->DSAP; + if(pstEthCsPktInfo->ucDSAP == 0xAA && ((struct bcm_eth_llc_frame *)pvEthPayload)->SSAP == 0xAA) { //SNAP Frame pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame; |