From 460e78f001ea2bac0c5cf41e63b11e9ba86adb80 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 28 Feb 2012 15:48:42 -0500 Subject: [PATCH] --- yaml --- r: 290497 b: refs/heads/master c: 9100eb012a31dcc3f6eff1f09eb9e118b1e5b6c4 h: refs/heads/master i: 290495: f59afb8185c5cd7d83c7e3e5552e1684c9b79dc9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/cirrus/mac89x0.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 32087f0f73a4..2e41e1be9703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0695512a57a8ad5c0495b2a3b23b3216434e3f92 +refs/heads/master: 9100eb012a31dcc3f6eff1f09eb9e118b1e5b6c4 diff --git a/trunk/drivers/net/ethernet/cirrus/mac89x0.c b/trunk/drivers/net/ethernet/cirrus/mac89x0.c index 419825ceab3b..932fdccc339a 100644 --- a/trunk/drivers/net/ethernet/cirrus/mac89x0.c +++ b/trunk/drivers/net/ethernet/cirrus/mac89x0.c @@ -591,13 +591,13 @@ static void set_multicast_list(struct net_device *dev) static int set_mac_address(struct net_device *dev, void *addr) { - int i; struct sockaddr *saddr = addr; + int i; - if (!is_valid_ether_addr(addr->sa_data)) + if (!is_valid_ether_addr(saddr->sa_data)) return -EADDRNOTAVAIL; - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + memcpy(dev->dev_addr, saddr->sa_data, ETH_ALEN); printk("%s: Setting MAC address to %pM\n", dev->name, dev->dev_addr); /* set the Ethernet address */