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

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

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



This patch removes typedef for _ETH_CS_802_LLC_SNAP_FRAME, and
changes the name of the struct to bcm_eth_llc_snap_frame. In
addition, any calls to struct "ETH_CS_802_LLC_SNAP_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 30f5b4c2

drivers/staging/bcm/Protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ typedef struct _ETH_CS_802_LLC_FRAME { 
	unsigned char Control;

} __packed ETH_CS_802_LLC_FRAME;



typedef struct _ETH_CS_802_LLC_SNAP_FRAME {

struct bcm_eth_llc_snap_frame {

	struct bcm_eth_header EThHdr;

	unsigned char DSAP;

	unsigned char SSAP;

	unsigned char Control;

	unsigned char OUI[3];

	unsigned short usEtherType;

} __packed ETH_CS_802_LLC_SNAP_FRAME;

} __packed;



struct bcm_ethernet2_frame {

	struct bcm_eth_header EThHdr;

drivers/staging/bcm/Qos.c

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) 
		case eEth802LLCSNAPFrame:

		{

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : 802LLC SNAP Frame\n");

			pIpHeader = pvEThPayload + sizeof(ETH_CS_802_LLC_SNAP_FRAME);

			pIpHeader = pvEThPayload + sizeof(struct bcm_eth_llc_snap_frame);

			break;

		}

		case eEth802QVLANFrame:
@@ -835,7 +835,7 @@ static void EThCSGetPktInfo(struct bcm_mini_adapter *Adapter,PVOID pvEthPayload, 
		{

			//SNAP Frame

			pstEthCsPktInfo->eNwpktEthFrameType = eEth802LLCSNAPFrame;

			u16Etype = ((ETH_CS_802_LLC_SNAP_FRAME*)pvEthPayload)->usEtherType;

			u16Etype = ((struct bcm_eth_llc_snap_frame *)pvEthPayload)->usEtherType;

		}

	}

	if(u16Etype == ETHERNET_FRAMETYPE_IPV4)