devices/e1000/e1000_main-2.6.26-ethercat.c
changeset 2050 a3e59f2a8589
parent 1360 afcea72f0040
child 2421 bc2d4bf9cbe5
child 2589 2b9c78543663
equal deleted inserted replaced
2015:ce2fae4d3c4f 2050:a3e59f2a8589
  3932 		int ec_work_done = 0;
  3932 		int ec_work_done = 0;
  3933 #endif
  3933 #endif
  3934 		for (i = 0; i < E1000_MAX_INTR; i++) {
  3934 		for (i = 0; i < E1000_MAX_INTR; i++) {
  3935 #ifdef CONFIG_E1000_NAPI
  3935 #ifdef CONFIG_E1000_NAPI
  3936 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
  3936 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
  3937                             &ec_work_done, 100) &
  3937                             &ec_work_done, 100) &&
  3938 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  3938 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  3939 #else
  3939 #else
  3940 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
  3940 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
  3941 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  3941 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  3942 #endif
  3942 #endif
  3943 				break;
  3943 				break;
  3944 			}
  3944 			}
  3945 		}
  3945 		}
  4043 			int ec_work_done = 0;
  4043 			int ec_work_done = 0;
  4044 #endif
  4044 #endif
  4045 			for (i = 0; i < E1000_MAX_INTR; i++) {
  4045 			for (i = 0; i < E1000_MAX_INTR; i++) {
  4046 #ifdef CONFIG_E1000_NAPI
  4046 #ifdef CONFIG_E1000_NAPI
  4047 				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
  4047 				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
  4048 		                    &ec_work_done, 100) &
  4048 		                    &ec_work_done, 100) &&
  4049 							!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  4049 							!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  4050 #else
  4050 #else
  4051 				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &
  4051 				if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring) &&
  4052 							!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  4052 							!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
  4053 #endif
  4053 #endif
  4054 					break;
  4054 					break;
  4055 				}
  4055 				}
  4056 			}
  4056 			}