devices/e1000e/netdev-2.6.34-ethercat.c
branchstable-1.5
changeset 2500 97fd83907c7c
parent 2473 f62b64fdbc23
child 2582 87e502828b3f
equal deleted inserted replaced
2499:c350fc89afd7 2500:97fd83907c7c
  3773 	adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
  3773 	adapter->gotc = adapter->stats.gotc - adapter->gotc_old;
  3774 	adapter->gotc_old = adapter->stats.gotc;
  3774 	adapter->gotc_old = adapter->stats.gotc;
  3775 
  3775 
  3776 	e1000e_update_adaptive(&adapter->hw);
  3776 	e1000e_update_adaptive(&adapter->hw);
  3777 
  3777 
  3778 	if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
  3778 	if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
  3779 			|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
       
  3780 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
  3779 		tx_pending = (e1000_desc_unused(tx_ring) + 1 <
  3781 			       tx_ring->count);
  3780 			       tx_ring->count);
  3782 		if (tx_pending) {
  3781 		if (tx_pending) {
  3783 			/*
  3782 			/*
  3784 			 * We've lost link, so the controller stops DMA,
  3783 			 * We've lost link, so the controller stops DMA,