diff options
| author | Arend van Spriel <arend@broadcom.com> | 2010-12-22 09:30:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-20 15:17:42 -0800 |
| commit | a44d42367fe73e7720d309c4bde5ac79a6cd64a7 (patch) | |
| tree | 16fd0e22925f8098e4745bac06de77779cb69daa /drivers/staging/brcm80211/util/bcmsrom.c | |
| parent | 1e6610862c96fbe84534507e58014b50e0a1df5b (diff) | |
| download | op-kernel-dev-a44d42367fe73e7720d309c4bde5ac79a6cd64a7.zip op-kernel-dev-a44d42367fe73e7720d309c4bde5ac79a6cd64a7.tar.gz | |
staging: brcm80211: last nail into proto/ethernet.h
cleaned up last artifacts used from proto/ethernet.h and
subsequently the file can be removed.
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>
Diffstat (limited to 'drivers/staging/brcm80211/util/bcmsrom.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/bcmsrom.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index fc836ee..622cd30 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -45,7 +45,6 @@ #endif #include <linux/if_ether.h> -#include <proto/ethernet.h> /* for sprom content groking */ #define BS_ERROR(args) @@ -1726,16 +1725,16 @@ static void _initvars_srom_pci(u8 sromrev, u16 *srom, uint off, varbuf_t *b) continue; if (flags & SRFL_ETHADDR) { - struct ether_addr ea; + u8 ea[ETH_ALEN]; - ea.octet[0] = (srom[srv->off - off] >> 8) & 0xff; - ea.octet[1] = srom[srv->off - off] & 0xff; - ea.octet[2] = (srom[srv->off + 1 - off] >> 8) & 0xff; - ea.octet[3] = srom[srv->off + 1 - off] & 0xff; - ea.octet[4] = (srom[srv->off + 2 - off] >> 8) & 0xff; - ea.octet[5] = srom[srv->off + 2 - off] & 0xff; + ea[0] = (srom[srv->off - off] >> 8) & 0xff; + ea[1] = srom[srv->off - off] & 0xff; + ea[2] = (srom[srv->off + 1 - off] >> 8) & 0xff; + ea[3] = srom[srv->off + 1 - off] & 0xff; + ea[4] = (srom[srv->off + 2 - off] >> 8) & 0xff; + ea[5] = srom[srv->off + 2 - off] & 0xff; - varbuf_append(b, "%s=%pM", name, ea.octet); + varbuf_append(b, "%s=%pM", name, ea); } else { ASSERT(mask_valid(srv->mask)); ASSERT(mask_width(srv->mask)); |
