Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1b37925 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 620fac92

drivers/staging/bcm/Protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/bcm/Qos.c

+2 −2
Original line number Diff line number Diff line
@@ -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