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>
This commit is contained in:
committed by
Jeff Garzik
parent
49afc59ca6
commit
7eec517c44
@@ -895,8 +895,6 @@ static int netxen_nic_open(struct net_device *netdev)
|
|||||||
|
|
||||||
/* Done here again so that even if phantom sw overwrote it,
|
/* Done here again so that even if phantom sw overwrote it,
|
||||||
* we set it */
|
* we set it */
|
||||||
if (adapter->macaddr_set)
|
|
||||||
adapter->macaddr_set(adapter, netdev->dev_addr);
|
|
||||||
if (adapter->init_port
|
if (adapter->init_port
|
||||||
&& adapter->init_port(adapter, adapter->portnum) != 0) {
|
&& adapter->init_port(adapter, adapter->portnum) != 0) {
|
||||||
del_timer_sync(&adapter->watchdog_timer);
|
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);
|
netxen_nic_driver_name, adapter->portnum);
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
|
if (adapter->macaddr_set)
|
||||||
|
adapter->macaddr_set(adapter, netdev->dev_addr);
|
||||||
|
|
||||||
netxen_nic_set_link_parameters(adapter);
|
netxen_nic_set_link_parameters(adapter);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user