提交 620fac92 编写于 作者: K Kevin McKinney 提交者: Greg Kroah-Hartman

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: NKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 9bcacc29
...@@ -52,12 +52,12 @@ typedef struct _ETH_CS_802_Q_FRAME { ...@@ -52,12 +52,12 @@ typedef struct _ETH_CS_802_Q_FRAME {
unsigned short EthType; unsigned short EthType;
} __packed ETH_CS_802_Q_FRAME; } __packed ETH_CS_802_Q_FRAME;
typedef struct _ETH_CS_802_LLC_FRAME { struct bcm_eth_llc_frame {
struct bcm_eth_header EThHdr; struct bcm_eth_header EThHdr;
unsigned char DSAP; unsigned char DSAP;
unsigned char SSAP; unsigned char SSAP;
unsigned char Control; unsigned char Control;
} __packed ETH_CS_802_LLC_FRAME; } __packed;
struct bcm_eth_llc_snap_frame { struct bcm_eth_llc_snap_frame {
struct bcm_eth_header EThHdr; struct bcm_eth_header EThHdr;
......
...@@ -467,7 +467,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) ...@@ -467,7 +467,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
case eEth802LLCFrame: case eEth802LLCFrame:
{ {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLCFrame\n"); 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; break;
} }
...@@ -830,8 +830,8 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, ...@@ -830,8 +830,8 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
//802.2 LLC //802.2 LLC
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "802.2 LLC Frame \n"); BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "802.2 LLC Frame \n");
pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCFrame; pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCFrame;
pstEthCsPktInfo->ucDSAP = ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->DSAP; pstEthCsPktInfo->ucDSAP = ((struct bcm_eth_llc_frame *)pvEthPayload)->DSAP;
if(pstEthCsPktInfo->ucDSAP == 0xAA && ((ETH_CS_802_LLC_FRAME*)pvEthPayload)->SSAP == 0xAA) if(pstEthCsPktInfo->ucDSAP == 0xAA && ((struct bcm_eth_llc_frame *)pvEthPayload)->SSAP == 0xAA)
{ {
//SNAP Frame //SNAP Frame
pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame; pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册