branch | stable-1.5 |
changeset 2500 | 97fd83907c7c |
parent 2499 | c350fc89afd7 |
child 2582 | 87e502828b3f |
--- a/devices/e1000e/netdev-2.6.37-ethercat.c Fri Jan 11 15:07:11 2013 +0100 +++ b/devices/e1000e/netdev-2.6.37-ethercat.c Tue Feb 05 13:56:29 2013 +0100 @@ -4382,8 +4382,7 @@ e1000e_update_adaptive(&adapter->hw); - if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev)) - || (!adapter->ecdev && !netif_carrier_ok(netdev))) { + if (!adapter->ecdev && !netif_carrier_ok(netdev)) { tx_pending = (e1000_desc_unused(tx_ring) + 1 < tx_ring->count); if (tx_pending) {