igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()

If VFs are enabled (max_vfs >= 1), both max_rss_queues and
adapter->rss_queues are set to 2 in the case of e1000_82576.
In this case, IGB_FLAG_QUEUE_PAIRS is always set in the default block as a
result of fall-through, thus setting it in the e1000_82576 block is not
necessary.

Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 31e5f39428393818257853b44b0b4915f4817eac..eb24b403534f1bb33906d393a3af17fd0cf61980 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2921,14 +2921,6 @@ void igb_set_flag_queue_pairs(struct igb_adapter *adapter,
                /* Device supports enough interrupts without queue pairing. */
                break;
        case e1000_82576:
-               /* If VFs are going to be allocated with RSS queues then we
-                * should pair the queues in order to conserve interrupts due
-                * to limited supply.
-                */
-               if ((adapter->rss_queues > 1) &&
-                   (adapter->vfs_allocated_count > 6))
-                       adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
-               /* fall through */
        case e1000_82580:
        case e1000_i350:
        case e1000_i354: