diff options
| author | Joe Perches | 2010-12-14 01:57:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-12-16 21:21:27 +0100 |
| commit | ed9568687e82c56017ca1aacf6eda9902939bf4a (patch) | |
| tree | 4a666c802bd51aeac289905d0b4ce023dfe37b0b /drivers/staging/brcm80211/util | |
| parent | staging: brcm80211: Remove unused ether_<foo> #defines and struct (diff) | |
| download | kernel-qcow2-linux-ed9568687e82c56017ca1aacf6eda9902939bf4a.tar.gz kernel-qcow2-linux-ed9568687e82c56017ca1aacf6eda9902939bf4a.tar.xz kernel-qcow2-linux-ed9568687e82c56017ca1aacf6eda9902939bf4a.zip | |
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/util')
| -rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index 8393d58bab57..668dac6d4415 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/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]); |