From 01d2f0a79a306e049f172eb43bde32de1ad46c5d Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Tue, 10 Jan 2012 06:40:23 +0000 Subject: [PATCH] --- yaml --- r: 284283 b: refs/heads/master c: 71bc5d94061516c4e70303570128797bcf768b10 h: refs/heads/master i: 284281: fbcb424633a627781d93906b9cb6f7906440cf08 284279: 88d05a4622347da42f1b913e8b4d66cbf5e0482f v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/asix.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4a24da163ce7..6303a1af3ac9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ef66bdc4bda6aac2dae73b84d79dc8c2db33637 +refs/heads/master: 71bc5d94061516c4e70303570128797bcf768b10 diff --git a/trunk/drivers/net/usb/asix.c b/trunk/drivers/net/usb/asix.c index 8414bdc21235..8e84f5bdd6ca 100644 --- a/trunk/drivers/net/usb/asix.c +++ b/trunk/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;