# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1322057467 -3600
# Node ID b0fe561ec7df79d3227ad6be7e610cbee1a75b51
# Parent  631cd979023ff5f836e5599e382422790866664d
Fixed accidentially used operator & by using &&.

diff -r 631cd979023f -r b0fe561ec7df devices/e1000/e1000_main-2.6.31-ethercat.c
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c	Thu Dec 15 14:05:44 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.31-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3804,7 +3804,7 @@
 		int i, ec_work_done = 0;
 		for (i = 0; i < E1000_MAX_INTR; i++) {
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-						&ec_work_done, 100) &
+						&ec_work_done, 100) &&
 					!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 				break;
 			}
diff -r 631cd979023f -r b0fe561ec7df devices/e1000/e1000_main-2.6.33-ethercat.c
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c	Thu Dec 15 14:05:44 2011 +0100
+++ b/devices/e1000/e1000_main-2.6.33-ethercat.c	Wed Nov 23 15:11:07 2011 +0100
@@ -3468,7 +3468,7 @@
 		int i, ec_work_done = 0;
 		for (i = 0; i < E1000_MAX_INTR; i++) {
 			if (unlikely(!adapter->clean_rx(adapter, adapter->rx_ring,
-							&ec_work_done, 100) &
+							&ec_work_done, 100) &&
 						!e1000_clean_tx_irq(adapter, adapter->tx_ring))) {
 				break;
 			}