aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>2015-12-11 18:44:00 +0900
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-02-15 16:14:50 -0800
commit37a5d163fb447b39f7960d0534de30e88ad395bb (patch)
tree3f1212ebf74e94dbf57533656077e8911eea6478
parentigb: Remove unnecessary flag setting in igb_set_flag_queue_pairs() (diff)
downloadlinux-dev-37a5d163fb447b39f7960d0534de30e88ad395bb.tar.xz
linux-dev-37a5d163fb447b39f7960d0534de30e88ad395bb.zip
igb: Unpair the queues when changing the number of queues
By the commit 72ddef0506da ("igb: Fix oops caused by missing queue pairing"), the IGB_FLAG_QUEUE_PAIRS flag can now be set when changing the number of queues by "ethtool -L", but it is never cleared unless the igb driver is reloaded. This patch clears it if queue pairing becomes unnecessary as a result of "ethtool -L". 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>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index eb24b403534f..85c47aa16a31 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2931,6 +2931,8 @@ void igb_set_flag_queue_pairs(struct igb_adapter *adapter,
*/
if (adapter->rss_queues > (max_rss_queues / 2))
adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+ else
+ adapter->flags &= ~IGB_FLAG_QUEUE_PAIRS;
break;
}
}