diff options
| author | Daniel Drake <dsd@laptop.org> | 2009-12-24 09:11:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-27 05:24:45 +0100 |
| commit | 1f04493123763f5b8bc6d5de9aed0222345c052c (patch) | |
| tree | 85b27e8a82a63a875740b67e9016fc11f432c453 /drivers/net/3c507.c | |
| parent | gianfar: Fix gianfar select_queue bogosity (diff) | |
| download | linux-1f04493123763f5b8bc6d5de9aed0222345c052c.tar.xz linux-1f04493123763f5b8bc6d5de9aed0222345c052c.zip | |
Fix MAC address access in 3c507, ibmlana, pcnet32 and libertas
Commit f001fde5eadd915f4858d22ed70d7040f48767cf changed
net_device.dev_addr from a 32-byte array to a pointer.
I found 4 ethernet drivers which rely on sizeof(dev_addr), which are now
only copying 4 bytes of the address information on 32bit systems.
Fix them to use ETH_ALEN.
Signed-off-by: Daniel Drake <dsd@laptop.org>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/3c507.c')
| -rw-r--r-- | drivers/net/3c507.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index fbc231153e55..77cf0901a441 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c @@ -56,6 +56,7 @@ static const char version[] = #include <linux/errno.h> #include <linux/netdevice.h> #include <linux/etherdevice.h> +#include <linux/if_ether.h> #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/init.h> @@ -734,8 +735,7 @@ static void init_82586_mem(struct net_device *dev) memcpy_toio(lp->base, init_words + 5, sizeof(init_words) - 10); /* Fill in the station address. */ - memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr, - sizeof(dev->dev_addr)); + memcpy_toio(lp->base+SA_OFFSET, dev->dev_addr, ETH_ALEN); /* The Tx-block list is written as needed. We just set up the values. */ lp->tx_cmd_link = IDLELOOP + 4; |