Commit 8ef66bdc authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by David S. Miller

asix: fix setting custom MAC address on Asix 88772 devices

In kernel v3.2 initialization sequence for Asix 88772 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 ax88772_reset causes reload of MAC address from EEPROM.

This patch fixes the issue by rewriting MAC address at end of ax88772_reset.
Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: default avatarGrant Grundler <grundler@chromium.org>
Cc: Allan Chou <allan@asix.com.tw>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2193ceab
...@@ -978,6 +978,7 @@ static int ax88772_link_reset(struct usbnet *dev) ...@@ -978,6 +978,7 @@ static int ax88772_link_reset(struct usbnet *dev)
static int ax88772_reset(struct usbnet *dev) static int ax88772_reset(struct usbnet *dev)
{ {
struct asix_data *data = (struct asix_data *)&dev->data;
int ret, embd_phy; int ret, embd_phy;
u16 rx_ctl; u16 rx_ctl;
...@@ -1055,6 +1056,13 @@ static int ax88772_reset(struct usbnet *dev) ...@@ -1055,6 +1056,13 @@ static int ax88772_reset(struct usbnet *dev)
goto out; goto out;
} }
/* 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)
goto out;
/* Set RX_CTL to default values with 2k buffer, and enable cactus */ /* Set RX_CTL to default values with 2k buffer, and enable cactus */
ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL); ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL);
if (ret < 0) if (ret < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment