aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen
diff options
context:
space:
mode:
authordhananjay@netxen.com <dhananjay@netxen.com>2007-07-25 10:43:11 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-30 15:51:59 -0400
commit7eec517c444fad699d3fc66d110440edee1fb0ed (patch)
treec062155d256b34ad612b38f4a13a47e1fa2c1909 /drivers/net/netxen
parent49afc59ca6aa41e55cffdef39f94c774bce55bd8 (diff)
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>
Diffstat (limited to 'drivers/net/netxen')
-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 19e2fa940ac0..7d93bc3cb0db 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)
895 895
896 /* Done here again so that even if phantom sw overwrote it, 896 /* Done here again so that even if phantom sw overwrote it,
897 * we set it */ 897 * we set it */
898 if (adapter->macaddr_set)
899 adapter->macaddr_set(adapter, netdev->dev_addr);
900 if (adapter->init_port 898 if (adapter->init_port
901 && adapter->init_port(adapter, adapter->portnum) != 0) { 899 && adapter->init_port(adapter, adapter->portnum) != 0) {
902 del_timer_sync(&adapter->watchdog_timer); 900 del_timer_sync(&adapter->watchdog_timer);
@@ -904,6 +902,8 @@ static int netxen_nic_open(struct net_device *netdev)
904 netxen_nic_driver_name, adapter->portnum); 902 netxen_nic_driver_name, adapter->portnum);
905 return -EIO; 903 return -EIO;
906 } 904 }
905 if (adapter->macaddr_set)
906 adapter->macaddr_set(adapter, netdev->dev_addr);
907 907
908 netxen_nic_set_link_parameters(adapter); 908 netxen_nic_set_link_parameters(adapter);
909 909