diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-28 21:48:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-28 21:48:42 +0100 |
| commit | 9100eb012a31dcc3f6eff1f09eb9e118b1e5b6c4 (patch) | |
| tree | 369e65e68ae663415f73a839e56c846ac3d16340 /drivers/net/ethernet/cirrus | |
| parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
| download | linux-9100eb012a31dcc3f6eff1f09eb9e118b1e5b6c4.tar.xz linux-9100eb012a31dcc3f6eff1f09eb9e118b1e5b6c4.zip | |
mac89x0: Fix build error.
Need to use the new 'saddr' variable not the void 'addr' in
set_mac_address().
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cirrus')
| -rw-r--r-- | drivers/net/ethernet/cirrus/mac89x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cirrus/mac89x0.c b/drivers/net/ethernet/cirrus/mac89x0.c index 419825ceab3b..932fdccc339a 100644 --- a/drivers/net/ethernet/cirrus/mac89x0.c +++ b/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 */ |