diff options
| author | Clark Williams <williams@redhat.com> | 2012-01-25 21:31:16 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-25 21:31:16 -0600 |
| commit | 974f4b86951972b133b4ec5b36956b979dea08d0 (patch) | |
| tree | 090b441b1c96f708e8a033c7f88fa383dd1e7cba /drivers/net/usb/asix.c | |
| parent | 40a54e2e116950a27dbd0a46a7b1ff8e982de477 (diff) | |
| parent | 3499d6424f682a58761d827012567c552b053842 (diff) | |
Merge commit 'v3.2.2' into rt-3.2.2-rt10
Diffstat (limited to 'drivers/net/usb/asix.c')
| -rw-r--r-- | drivers/net/usb/asix.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index dd2625a3371a..f5e063a20cc4 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c @@ -974,6 +974,7 @@ static int ax88772_link_reset(struct usbnet *dev) static int ax88772_reset(struct usbnet *dev) { + struct asix_data *data = (struct asix_data *)&dev->data; int ret, embd_phy; u16 rx_ctl; @@ -1051,6 +1052,13 @@ static int ax88772_reset(struct usbnet *dev) 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 */ ret = asix_write_rx_ctl(dev, AX_DEFAULT_RX_CTL); if (ret < 0) @@ -1316,6 +1324,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; |