From c88328a5f065f8ac43a0d50f638c5542df6e1a64 Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Wed, 4 Nov 2015 16:02:21 -0800 Subject: [PATCH] ixgbevf: minor cleanups for ixgbevf_set_itr() Orabug: 23177316 adapter->rx_itr_setting is not a mask so check it with == instead of & do not default to 12K interrupts in ixgbevf_set_itr() There should be no functional effect from these changes. Signed-off-by: Emil Tantilov Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher (cherry picked from commit 9ad3d6f7eb300d464bfce2c80e7b1594f5e5eff9) Signed-off-by: Brian Maly Conflicts: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c --- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index f78384ff030c..b1c8d9db9416 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -1045,7 +1045,7 @@ static int ixgbevf_poll(struct napi_struct *napi, int budget) return budget; /* all work done, exit the polling mode */ napi_complete(napi); - if (adapter->rx_itr_setting & 1) + if (adapter->rx_itr_setting == 1) ixgbevf_set_itr(q_vector); if (!test_bit(__IXGBEVF_DOWN, &adapter->state) && !test_bit(__IXGBEVF_REMOVING, &adapter->state)) @@ -1248,9 +1248,10 @@ static void ixgbevf_set_itr(struct ixgbevf_q_vector *q_vector) new_itr = IXGBE_20K_ITR; break; case bulk_latency: - default: new_itr = IXGBE_12K_ITR; break; + default: + break; } if (new_itr != q_vector->itr) { -- 2.50.1