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

Commit e2582ad8 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove usage of struct ether_header 



In linux the is already a structure defined for the ethernet
header. Code now uses struct ethhdr instead.

Reviewed-by: default avatarBrett Rudley <brudley@broadcom.com>
Reviewed-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarDowan Kim <dowan@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c09240ac

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ wl_host_event(struct dhd_info *dhd, int *ifidx, void *pktdata, 
				if (ifevent->action == WLC_E_IF_ADD)

					dhd_add_if(dhd, ifevent->ifidx,

						   NULL, event->ifname,

						   pvt_data->eth.ether_dhost,

						   pvt_data->eth.h_dest,

						   ifevent->flags,

						   ifevent->bssidx);

				else

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+6 −6
Original line number Diff line number Diff line
@@ -1031,11 +1031,11 @@ int dhd_sendpkt(dhd_pub_t *dhdp, int ifidx, struct sk_buff *pktbuf) 
	/* Update multicast statistic */

	if (pktbuf->len >= ETH_ALEN) {

		u8 *pktdata = (u8 *) (pktbuf->data);

		struct ether_header *eh = (struct ether_header *)pktdata;

		struct ethhdr *eh = (struct ethhdr *)pktdata;



		if (is_multicast_ether_addr(eh->ether_dhost))

		if (is_multicast_ether_addr(eh->h_dest))

			dhdp->tx_multicast++;

		if (ntoh16(eh->ether_type) == ETH_P_PAE)

		if (ntoh16(eh->h_proto) == ETH_P_PAE)

			atomic_inc(&dhd->pend_8021x_cnt);

	}
@@ -1255,13 +1255,13 @@ void dhd_txcomplete(dhd_pub_t *dhdp, struct sk_buff *txp, bool success) 
{

	uint ifidx;

	dhd_info_t *dhd = (dhd_info_t *) (dhdp->info);

	struct ether_header *eh;

	struct ethhdr *eh;

	u16 type;



	dhd_prot_hdrpull(dhdp, &ifidx, txp);



	eh = (struct ether_header *)(txp->data);

	type = ntoh16(eh->ether_type);

	eh = (struct ethhdr *)(txp->data);

	type = ntoh16(eh->h_proto);



	if (type == ETH_P_PAE)

		atomic_dec(&dhd->pend_8021x_cnt);

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include <sbsdpcmdev.h>

#include <bcmsdpcm.h>



#include <proto/ethernet.h>

#include <proto/802.1d.h>

#include <proto/802.11.h>

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 


#include <bcmutils.h>

#include <bcmendian.h>

#include <proto/ethernet.h>



#include <asm/uaccess.h>

drivers/staging/brcm80211/brcmfmac/wl_iw.c

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 


#include <bcmutils.h>

#include <bcmendian.h>

#include <proto/ethernet.h>



#include <linux/if_arp.h>

#include <asm/uaccess.h>
@@ -35,7 +34,6 @@ 
typedef const struct si_pub si_t;

#include <wlioctl.h>



#include <proto/ethernet.h>

#include <dngl_stats.h>

#include <dhd.h>