diff options
| author | Divy Le Ray | 2007-04-10 05:10:27 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2007-04-11 17:54:43 +0200 |
| commit | 59cf81076a85e1df273155298c462574b49cc0fe (patch) | |
| tree | d03245a0621b241fe5afa0e86bc65c8db28001e1 /drivers/net/cxgb3/cxgb3_main.c | |
| parent | cxgb3 - avoid deadlock with mac watchdog (diff) | |
| download | kernel-qcow2-linux-59cf81076a85e1df273155298c462574b49cc0fe.tar.gz kernel-qcow2-linux-59cf81076a85e1df273155298c462574b49cc0fe.tar.xz kernel-qcow2-linux-59cf81076a85e1df273155298c462574b49cc0fe.zip | |
cxgb3 - MAC watchdog update
The MAC watchdog was failing if the peer interface was brought down.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index c6ebe25464ca..d6eb9824a10c 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -194,15 +194,13 @@ void t3_os_link_changed(struct adapter *adapter, int port_id, int link_stat, if (link_stat != netif_carrier_ok(dev)) { if (link_stat) { - t3_set_reg_field(adapter, - A_XGM_TXFIFO_CFG + mac->offset, - F_ENDROPPKT, 0); + t3_mac_enable(mac, MAC_DIRECTION_RX); netif_carrier_on(dev); } else { netif_carrier_off(dev); - t3_set_reg_field(adapter, - A_XGM_TXFIFO_CFG + mac->offset, - F_ENDROPPKT, F_ENDROPPKT); + pi->phy.ops->power_down(&pi->phy, 1); + t3_mac_disable(mac, MAC_DIRECTION_RX); + t3_link_start(&pi->phy, mac, &pi->link_config); } link_report(dev); |