aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorShota Suzuki <[email protected]>2015-12-11 09:44:00 +0000
committerJeff Kirsher <[email protected]>2016-02-16 00:14:50 +0000
commit37a5d163fb447b39f7960d0534de30e88ad395bb (patch)
tree3f1212ebf74e94dbf57533656077e8911eea6478 /drivers/net/ethernet/intel/igb/igb_main.c
parentigb: Remove unnecessary flag setting in igb_set_flag_queue_pairs() (diff)
downloadkernel-37a5d163fb447b39f7960d0534de30e88ad395bb.tar.gz
kernel-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 <[email protected]> Tested-by: Aaron Brown <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-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;
}
}