Subject: e1000: The user-supplied itr setting needs the lower 2 bits masked off
From: Jesse Brandeburg <redacted>

The lower 2 bits of a user-supplied itr setting (via ethtool) need to be
masked off: These lower two bits are used as control bits.

Signed-off-by: Jesse Brandeburg <redacted>
Signed-off-by: Auke Kok <redacted>
Signed-off-by: Arjan van de Ven <redacted>

---
 drivers/net/e1000/e1000_param.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/drivers/net/e1000/e1000_param.c
===================================================================

--- linux-2.6.orig/drivers/net/e1000/e1000_param.c
+++ linux-2.6/drivers/net/e1000/e1000_param.c

@@ -487,7 +487,9 @@ e1000_check_options(struct e1000_adapter
 				e1000_validate_option(&adapter->itr, &opt,
 				        adapter);
 				/* save the setting, because the dynamic bits change itr */
-				adapter->itr_setting = adapter->itr;
+				/* clear the lower two bits because they are
+				 * used as control */
+				adapter->itr_setting = adapter->itr & ~3;
 				break;
 			}
 		} else {