diff options
| author | Joe Perches <joe@perches.com> | 2010-12-13 16:57:00 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 12:21:27 -0800 |
| commit | ed9568687e82c56017ca1aacf6eda9902939bf4a (patch) | |
| tree | 4a666c802bd51aeac289905d0b4ce023dfe37b0b /drivers/staging/brcm80211/sys/wlc_bmac.c | |
| parent | 47c6de7d37619d105de0367aece9ab10288225bc (diff) | |
| download | op-kernel-dev-ed9568687e82c56017ca1aacf6eda9902939bf4a.zip op-kernel-dev-ed9568687e82c56017ca1aacf6eda9902939bf4a.tar.gz | |
staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
Use the normal kernel calls and remove the #defines
for ETHER_IS_BCAST and ETHER_IS_NULLADDR.
Add #include for etherdevice.h where necessary.
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_bmac.c')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_bmac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index dff4f6b..2baacfd 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/pci.h> #include <linux/netdevice.h> +#include <linux/etherdevice.h> #include <bcmdefs.h> #include <osl.h> #include <proto/802.11.h> @@ -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; |
