From 4e9f07eddbe2aea4be075a3224399989115ef5f0 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 13 Dec 2010 16:57:00 -0800 Subject: [PATCH] --- yaml --- r: 228390 b: refs/heads/master c: ed9568687e82c56017ca1aacf6eda9902939bf4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c | 3 ++- .../staging/brcm80211/include/proto/ethernet.h | 13 ------------- trunk/drivers/staging/brcm80211/sys/wlc_bmac.c | 5 +++-- trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c | 6 +++--- trunk/drivers/staging/brcm80211/util/bcmsrom.c | 4 ++-- 6 files changed, 11 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 8f7ba5bb4f66..12f25b272f45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47c6de7d37619d105de0367aece9ab10288225bc +refs/heads/master: ed9568687e82c56017ca1aacf6eda9902939bf4a diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c index 2e0eab121e97..abf5d743b373 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -772,7 +772,8 @@ wl_iw_set_wap(struct net_device *dev, return -EINVAL; } - if (ETHER_ISBCAST(awrq->sa_data) || ETHER_ISNULLADDR(awrq->sa_data)) { + if (is_broadcast_ether_addr(awrq->sa_data) || + is_zero_ether_addr(awrq->sa_data)) { scb_val_t scbval; memset(&scbval, 0, sizeof(scb_val_t)); (void)dev_wlc_ioctl(dev, WLC_DISASSOC, &scbval, diff --git a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h index 1b352c5e29b8..086b9b962125 100644 --- a/trunk/drivers/staging/brcm80211/include/proto/ethernet.h +++ b/trunk/drivers/staging/brcm80211/include/proto/ethernet.h @@ -66,19 +66,6 @@ BWL_PRE_PACKED_STRUCT struct ether_addr { static const struct ether_addr ether_bcast = { {255, 255, 255, 255, 255, 255} }; -#define ETHER_ISBCAST(ea) ((((u8 *)(ea))[0] & \ - ((u8 *)(ea))[1] & \ - ((u8 *)(ea))[2] & \ - ((u8 *)(ea))[3] & \ - ((u8 *)(ea))[4] & \ - ((u8 *)(ea))[5]) == 0xff) -#define ETHER_ISNULLADDR(ea) ((((u8 *)(ea))[0] | \ - ((u8 *)(ea))[1] | \ - ((u8 *)(ea))[2] | \ - ((u8 *)(ea))[3] | \ - ((u8 *)(ea))[4] | \ - ((u8 *)(ea))[5]) == 0) - #define ETHER_MOVE_HDR(d, s) \ do { \ struct ether_header t; \ diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c b/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c index dff4f6bf77e2..2baacfd3ba91 100644 --- a/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/trunk/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1022,8 +1023,8 @@ int wlc_bmac_attach(struct wlc_info *wlc, u16 vendor, u16 device, uint unit, goto fail; } bcm_ether_atoe(macaddr, &wlc_hw->etheraddr); - if (ETHER_ISBCAST((char *)&wlc_hw->etheraddr) || - ETHER_ISNULLADDR((char *)&wlc_hw->etheraddr)) { + if (is_broadcast_ether_addr(wlc_hw->etheraddr.octet) || + is_zero_ether_addr(wlc_hw->etheraddr.octet)) { WL_ERROR(("wl%d: wlc_bmac_attach: bad macaddr %s\n", unit, macaddr)); err = 22; diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c index 24bf64d66227..daa67c9641a8 100644 --- a/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/trunk/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -3633,8 +3633,8 @@ _wlc_ioctl(struct wlc_info *wlc, int cmd, void *arg, int len, u16 lo; u32 hi; /* group keys in WPA-NONE (IBSS only, AES and TKIP) use a global TXIV */ - if ((bsscfg->WPA_auth & WPA_AUTH_NONE) - && ETHER_ISNULLADDR(&key->ea)) { + if ((bsscfg->WPA_auth & WPA_AUTH_NONE) && + is_zero_ether_addr(key->ea.octet)) { lo = bsscfg->wpa_none_txiv.lo; hi = bsscfg->wpa_none_txiv.hi; } else { @@ -7026,7 +7026,7 @@ void BCMFASTPATH wlc_recv(struct wlc_info *wlc, struct sk_buff *p) if (!is_amsdu) { /* CTS and ACK CTL frames are w/o a2 */ if (FC_TYPE(fc) == FC_TYPE_DATA || FC_TYPE(fc) == FC_TYPE_MNG) { - if ((ETHER_ISNULLADDR(&h->a2) || + if ((is_zero_ether_addr(h->a2.octet) || is_multicast_ether_addr(h->a2.octet))) { WL_ERROR(("wl%d: %s: dropping a frame with " "invalid src mac address, a2: %pM\n", diff --git a/trunk/drivers/staging/brcm80211/util/bcmsrom.c b/trunk/drivers/staging/brcm80211/util/bcmsrom.c index 8393d58bab57..668dac6d4415 100644 --- a/trunk/drivers/staging/brcm80211/util/bcmsrom.c +++ b/trunk/drivers/staging/brcm80211/util/bcmsrom.c @@ -502,7 +502,7 @@ int srom_parsecis(struct osl_info *osh, u8 *pcis[], uint ciscnt, char **vars, /* set macaddr if HNBU_MACADDR not seen yet */ if (eabuf[0] == '\0' && cis[i] == LAN_NID && - !(ETHER_ISNULLADDR(&cis[i + 2])) && + !is_zero_ether_addr(&cis[i + 2]) && !is_multicast_ether_addr(&cis[i + 2])) { ASSERT(cis[i + 1] == ETHER_ADDR_LEN); @@ -974,7 +974,7 @@ int srom_parsecis(struct osl_info *osh, u8 *pcis[], uint ciscnt, char **vars, break; case HNBU_MACADDR: - if (!(ETHER_ISNULLADDR(&cis[i + 1])) && + if (!is_zero_ether_addr(&cis[i + 1]) && !is_multicast_ether_addr(&cis[i + 1])) { snprintf(eabuf, sizeof(eabuf), "%pM", &cis[i + 1]);