devices/e1000e/netdev-3.4-ethercat.c
branchstable-1.5
changeset 2500 97fd83907c7c
parent 2497 505cf41488a4
child 2582 87e502828b3f
--- a/devices/e1000e/netdev-3.4-ethercat.c	Fri Jan 11 15:07:11 2013 +0100
+++ b/devices/e1000e/netdev-3.4-ethercat.c	Tue Feb 05 13:56:29 2013 +0100
@@ -4681,9 +4681,8 @@
 
 	e1000e_update_adaptive(&adapter->hw);
 
-	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
-			|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
-	    	(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
+	if (!adapter->ecdev && !netif_carrier_ok(netdev) &&
+		(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
 		/*
 		 * We've lost link, so the controller stops DMA,
 		 * but we've got queued Tx work that's never going