Re: [PATCH 03/11] cirrus/mac89x0: print MAC via printk format specifier
flat view
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: 2012-02-25 10:15:24
Also in:
lkml
On Fri, Feb 24, 2012 at 14:45, Danny Kukawka [off-list ref] wrote:
Print MAC/dev_addr via printk extended format specifier %pM instead of custom code. Use memcpy to set the address to dev->dev_addr in set_mac_address, instead of mxing it up in a for loop with printing a debug msg. Check also if the given address is valid.
Why do you sneak in this check in this patch?
quoted hunk ↗ jump to hunk
Signed-off-by: Danny Kukawka <redacted> --- drivers/net/ethernet/cirrus/mac89x0.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c index 83781f3..a7324ce 100644 --- a/drivers/net/ethernet/cirrus/mac89x0.c +++ b/drivers/net/ethernet/cirrus/mac89x0.c@@ -592,10 +592,14 @@ static void set_multicast_list(struct net_device *dev)static int set_mac_address(struct net_device *dev, void *addr) { int i; - printk("%s: Setting MAC address to ", dev->name); - for (i = 0; i < 6; i++) - printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]); - printk(".\n"); + struct sockaddr *saddr = addr; + + if (!is_valid_ether_addr(addr->sa_data)) + return -EADDRNOTAVAIL; + + memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + printk("%s: Setting MAC address to %pM\n", dev->name, dev->dev_addr); + /* set the Ethernet address */ for (i=0; i < ETH_ALEN/2; i++) writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds