summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhananjay@netxen.com <dhananjay@netxen.com>2007-07-25 20:13:11 +0530
committerJeff Garzik <jeff@garzik.org>2007-07-30 15:51:59 -0400
commit7eec517c444fad699d3fc66d110440edee1fb0ed (patch)
treec062155d256b34ad612b38f4a13a47e1fa2c1909
parent49afc59ca6aa41e55cffdef39f94c774bce55bd8 (diff)
downloadop-kernel-dev-7eec517c444fad699d3fc66d110440edee1fb0ed.zip
op-kernel-dev-7eec517c444fad699d3fc66d110440edee1fb0ed.tar.gz
netxen: re-init station address after h/w init
This is a workaround for firmware bug with 2nd port of multiport adapter, where MAC address is reset. Driver just needs to overwrite it with the value read from PROM. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/netxen/netxen_nic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 19e2fa9..7d93bc3 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -895,8 +895,6 @@ static int netxen_nic_open(struct net_device *netdev)
/* Done here again so that even if phantom sw overwrote it,
* we set it */
- if (adapter->macaddr_set)
- adapter->macaddr_set(adapter, netdev->dev_addr);
if (adapter->init_port
&& adapter->init_port(adapter, adapter->portnum) != 0) {
del_timer_sync(&adapter->watchdog_timer);
@@ -904,6 +902,8 @@ static int netxen_nic_open(struct net_device *netdev)
netxen_nic_driver_name, adapter->portnum);
return -EIO;
}
+ if (adapter->macaddr_set)
+ adapter->macaddr_set(adapter, netdev->dev_addr);
netxen_nic_set_link_parameters(adapter);
OpenPOWER on IntegriCloud