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

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

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



This patch removes typedef for _ETH_CS_ETH2_FRAME, and
changes the name of the struct to bcm_ethernet2_frame. In
addition, any calls to struct "ETH_CS_ETH2_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 4a19aaa7

drivers/staging/bcm/Protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ typedef struct _ETH_CS_802_LLC_SNAP_FRAME { 
	unsigned short usEtherType;

} __packed ETH_CS_802_LLC_SNAP_FRAME;



typedef struct _ETH_CS_ETH2_FRAME {

struct bcm_ethernet2_frame {

	struct bcm_eth_header EThHdr;

} __packed ETH_CS_ETH2_FRAME;

} __packed;



#define ETHERNET_FRAMETYPE_IPV4		ntohs(0x0800)

#define ETHERNET_FRAMETYPE_IPV6		ntohs(0x86dd)

drivers/staging/bcm/Qos.c

+2 −2
Original line number Diff line number Diff line
@@ -486,13 +486,13 @@ USHORT ClassifyPacket(struct bcm_mini_adapter *Adapter,struct sk_buff* skb) 
		case eEthOtherFrame:

		{

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : ETH Other Frame\n");

			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);

			pIpHeader = pvEThPayload + sizeof(struct bcm_ethernet2_frame);

			break;

		}

		default:

		{

			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "ClassifyPacket : Unrecognized ETH Frame\n");

			pIpHeader = pvEThPayload + sizeof(ETH_CS_ETH2_FRAME);

			pIpHeader = pvEThPayload + sizeof(struct bcm_ethernet2_frame);

			break;

		}

	}