diff options
author | Joe Perches | 2010-12-14 01:56:58 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-12-16 21:21:27 +0100 |
commit | 3ca5ada504a41d9a8afd1e25f85f11d1761efa5f (patch) | |
tree | 02d7c55f00d2276e47347fca3d770878cf7b82d8 /drivers/staging/brcm80211/util | |
parent | staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR (diff) | |
download | kernel-qcow2-linux-3ca5ada504a41d9a8afd1e25f85f11d1761efa5f.tar.gz kernel-qcow2-linux-3ca5ada504a41d9a8afd1e25f85f11d1761efa5f.tar.xz kernel-qcow2-linux-3ca5ada504a41d9a8afd1e25f85f11d1761efa5f.zip |
staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
Use the standard kernel function.
Change callers to add .octet to addressing to avoid warnings.
Add #include <linux/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/util')
-rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index 3a0beb93c0b6..8393d58bab57 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -15,6 +15,7 @@ */ #include <linux/kernel.h> #include <linux/string.h> +#include <linux/etherdevice.h> #include <bcmdefs.h> #include <osl.h> #include <linux/module.h> @@ -499,10 +500,10 @@ int srom_parsecis(struct osl_info *osh, u8 *pcis[], uint ciscnt, char **vars, break; default: /* set macaddr if HNBU_MACADDR not seen yet */ - if (eabuf[0] == '\0' - && cis[i] == LAN_NID - && !(ETHER_ISNULLADDR(&cis[i + 2])) - && !(ETHER_ISMULTI(&cis[i + 2]))) { + if (eabuf[0] == '\0' && + cis[i] == LAN_NID && + !(ETHER_ISNULLADDR(&cis[i + 2])) && + !is_multicast_ether_addr(&cis[i + 2])) { ASSERT(cis[i + 1] == ETHER_ADDR_LEN); snprintf(eabuf, sizeof(eabuf), @@ -974,7 +975,7 @@ int srom_parsecis(struct osl_info *osh, u8 *pcis[], uint ciscnt, char **vars, case HNBU_MACADDR: if (!(ETHER_ISNULLADDR(&cis[i + 1])) && - !(ETHER_ISMULTI(&cis[i + 1]))) { + !is_multicast_ether_addr(&cis[i + 1])) { snprintf(eabuf, sizeof(eabuf), "%pM", &cis[i + 1]); |