]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ixgbevf: minor cleanups for ixgbevf_set_itr()
authorEmil Tantilov <emil.s.tantilov@intel.com>
Thu, 5 Nov 2015 00:02:21 +0000 (16:02 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 6 Jul 2016 23:40:37 +0000 (16:40 -0700)
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 <emil.s.tantilov@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 9ad3d6f7eb300d464bfce2c80e7b1594f5e5eff9)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

index f78384ff030c92999bdc1525e0f4658970c68678..b1c8d9db941648f2e4d50d3d3865f1ba65c6aec9 100644 (file)
@@ -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) {