Merge ../linux-2.6-watchdog-mm

[pandora-kernel.git] / drivers / net / e1000 / e1000_param.c

diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index cbfcd7f..cf2a279 100644 (file)
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -487,7 +487,9 @@ e1000_check_options(struct e1000_adapter *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 {