A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

staging: brcm80211: remove usage of struct ether_header

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

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel 2010-12-22 09:30:11 +01:00 • committed by Greg Kroah-Hartman
commit e2582ad85a
8 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file

@ -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

12
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file

@ -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);

1
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file

@ -44,7 +44,6 @@
#include <sbsdpcmdev.h>
#include <bcmsdpcm.h>
#include <proto/ethernet.h>
#include <proto/802.1d.h>
#include <proto/802.11.h>

1
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
View file

@ -20,7 +20,6 @@
#include <bcmutils.h>
#include <bcmendian.h>
#include <proto/ethernet.h>
#include <asm/uaccess.h>

2
drivers/staging/brcm80211/brcmfmac/wl_iw.c
View file

@ -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>

2
drivers/staging/brcm80211/include/proto/bcmevent.h
View file

@ -40,7 +40,7 @@ typedef BWL_PRE_PACKED_STRUCT struct {
#ifdef BRCM_FULLMAC
typedef BWL_PRE_PACKED_STRUCT struct bcm_event {
struct ether_header eth;
struct ethhdr eth;
bcmeth_hdr_t bcm_hdr;
wl_event_msg_t event;
} BWL_POST_PACKED_STRUCT bcm_event_t;

2
drivers/staging/brcm80211/sys/wlc_mac80211.c
View file

@ -1729,7 +1729,7 @@ void *wlc_attach(void *wl, u16 vendor, u16 device, uint unit, bool piomode,
/* some code depends on packed structures */
ASSERT(sizeof(struct ether_addr) == ETH_ALEN);
ASSERT(sizeof(struct ether_header) == ETH_HLEN);
ASSERT(sizeof(struct ethhdr) == ETH_HLEN);
ASSERT(sizeof(d11regs_t) == SI_CORE_SIZE);
ASSERT(sizeof(ofdm_phy_hdr_t) == D11_PHY_HDR_LEN);
ASSERT(sizeof(cck_phy_hdr_t) == D11_PHY_HDR_LEN);

1
drivers/staging/brcm80211/util/bcmsrom.c
View file

@ -44,6 +44,7 @@
#include <sbsdpcmdev.h>
#endif
#include <linux/if_ether.h>
#include <proto/ethernet.h> /* for sprom content groking */
#define BS_ERROR(args)