evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: bcm: Remove typedef for _ETH_CS_802_Q_FRAME and call directly.

Browse source 
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>
This commit is contained in:
Kevin McKinney 2012-12-22 14:27:52 -05:00 • committed by Greg Kroah-Hartman
parent 620fac923c
commit d1b37925ba
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/bcm/Protocol.h
View file

@ -44,13 +44,13 @@ typedef struct _S_ETHCS_PKT_INFO {
unsigned char ucDSAP; unsigned char ucDSAP;
} S_ETHCS_PKT_INFO, *PS_ETHCS_PKT_INFO; } 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; struct bcm_eth_header EThHdr;
unsigned short UserPriority:3; unsigned short UserPriority:3;
unsigned short CFI:1; unsigned short CFI:1;
unsigned short VLANID:12; unsigned short VLANID:12;
unsigned short EthType; unsigned short EthType;
} __packed ETH_CS_802_Q_FRAME; } __packed;
struct bcm_eth_llc_frame { struct bcm_eth_llc_frame {
struct bcm_eth_header EThHdr; struct bcm_eth_header EThHdr;

4
drivers/staging/bcm/Qos.c
View file

@ -480,7 +480,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb)
case eEth802QVLANFrame: case eEth802QVLANFrame:
{ {
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802.1Q VLANFrame\n"); 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; break;
} }
case eEthOtherFrame: case eEthOtherFrame:
@ -815,7 +815,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload,
{ {
//802.1Q VLAN Header //802.1Q VLAN Header
pstEthCsPktInfo->eNwpktEthFrameType = eEth802QVLANFrame; 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 //((ETH_CS_802_Q_FRAME*)pvEthPayload)->UserPriority
} }
else else