diff options
| author | Wolfgang Grandegger <wg@denx.de> | 2011-11-14 23:19:14 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2011-11-22 08:39:24 +0100 |
| commit | 50d89f57572af12bb601ea804deff3b0794e60cc (patch) | |
| tree | 4072343ba2ef6d8be024ef40d60546a84901deee /drivers | |
| parent | f9342e2c3e81d62e42393c0c1a8179c309ef3a20 (diff) | |
smsc95xx: Fix MAC address programming
Commit 79ad54400932d6484178a372fb3b659e3437473b broke MAC address
programming in the SMSC95xx register set.
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Wolfgang Grandegger <wg@denx.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/eth/smsc95xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 7ee4f87ea..b5626e65f 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -20,6 +20,7 @@ * MA 02111-1307 USA */ +#include <asm/unaligned.h> #include <common.h> #include <usb.h> #include <linux/mii.h> @@ -372,13 +373,12 @@ static int smsc95xx_init_mac_address(struct eth_device *eth, static int smsc95xx_write_hwaddr(struct eth_device *eth) { struct ueth_data *dev = (struct ueth_data *)eth->priv; - u32 addr_lo, addr_hi; + u32 addr_lo = __get_unaligned_le32(ð->enetaddr[0]); + u32 addr_hi = __get_unaligned_le16(ð->enetaddr[4]); int ret; /* set hardware address */ debug("** %s()\n", __func__); - addr_lo = cpu_to_le32(*eth->enetaddr); - addr_hi = cpu_to_le16(*((u16 *)(eth->enetaddr + 4))); ret = smsc95xx_write_reg(dev, ADDRL, addr_lo); if (ret < 0) { debug("Failed to write ADDRL: %d\n", ret); |