Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceb27759 authored by Shota Suzuki's avatar Shota Suzuki Committed by Jeff Kirsher
Browse files

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: default avatarShota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 667f0063

drivers/net/ethernet/intel/igb/igb_main.c

+0 −8
Original line number Diff line number Diff line
@@ -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: