summaryrefslogtreecommitdiff
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-01-10 06:40:23 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-10 14:59:48 -0800
commit71bc5d94061516c4e70303570128797bcf768b10 (patch)
tree5625427bd7c047b0feffc0809ab91d91051a2014 /drivers/net/usb
parent8ef66bdc4bda6aac2dae73b84d79dc8c2db33637 (diff)
downloadlinux-3.10-71bc5d94061516c4e70303570128797bcf768b10.tar.gz
linux-3.10-71bc5d94061516c4e70303570128797bcf768b10.tar.bz2
linux-3.10-71bc5d94061516c4e70303570128797bcf768b10.zip
asix: fix setting custom MAC address on Asix 88178 devices
In kernel v3.2 initialization sequence for Asix 88178 devices was changed so that hardware is reseted on every time interface is brought up (ifconfig up), instead just at USB probe time. This causes problem with setting custom MAC address to device as ax88178_reset causes reload of MAC address from EEPROM. This patch fixes the issue by rewriting MAC address at end of ax88178_reset. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Acked-by: Grant Grundler <grundler@chromium.org> Cc: Allan Chou <allan@asix.com.tw> Cc: stable <stable@vger.kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/asix.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index 8414bdc2123..8e84f5bdd6c 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1328,6 +1328,13 @@ static int ax88178_reset(struct usbnet *dev)
if (ret < 0)
return ret;
+ /* Rewrite MAC address */
+ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN);
+ ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN,
+ data->mac_addr);
+ if (ret < 0)
+ return ret;
+
ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
if (ret < 0)
return ret;