1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f829d361452..e81dc853922 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2939,6 +2939,10 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
         u32 rxcsum;
         int i, j;
         u8 tcs = netdev_get_num_tc(adapter->netdev);
+        int maxq = adapter->ring_feature[RING_F_RSS].indices;
+
+        if (tcs)
+                maxq = min(maxq, adapter->num_tx_queues / tcs);
 
         /* Fill out hash function seeds */
         for (i = 0; i < 10; i++)
@@ -2946,7 +2950,7 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
 
         /* Fill out redirection table */
         for (i = 0, j = 0; i < 128; i++, j++) {
-                if (j == adapter->ring_feature[RING_F_RSS].indices)
+                if (j == maxq)
                         j = 0;
                 /* reta = 4-byte sliding window of
                  * 0x00..(indices-1)(indices-1)00..etc. */