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

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

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

drivers/staging/bcm/Protocol.h

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

drivers/staging/bcm/Qos.c

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