lkml.org 
[lkml]   [2012]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/11] cirrus/mac89x0: print MAC via printk format specifier
    Date
    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.

    Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
    ---
    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));
    --
    1.7.8.3


    \
     
     \ /
      Last update: 2012-02-24 14:49    [W:0.022 / U:247.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site