ixgbe: fix bounds checking in ixgbe_setup_tc for 82598

Orabug: 21918732

This patch resolves an issue where users were not able to dynamically
set number of queues for 82598 via ethtool -L

Reported-by: Tal Abudi <talabudi@gmail.com>
Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 7e3f5c8881ba45eba1c74344b00558920008e6e6)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 28a8506ebfa18ed03549241ea4aa52347ebc1e5a..7e1d1d0e86e45a0f3e12d3af48f41562d31a6422 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7842,9 +7842,10 @@ int ixgbe_setup_tc(struct net_device *dev, u8 tc)
        bool pools;
 
        /* Hardware supports up to 8 traffic classes */
-       if (tc > adapter->dcb_cfg.num_tcs.pg_tcs ||
-           (hw->mac.type == ixgbe_mac_82598EB &&
-            tc < MAX_TRAFFIC_CLASS))
+       if (tc > adapter->dcb_cfg.num_tcs.pg_tcs)
+               return -EINVAL;
+
+       if (hw->mac.type == ixgbe_mac_82598EB && tc && tc < MAX_TRAFFIC_CLASS)
                return -EINVAL;
 
        pools = (find_first_zero_bit(&adapter->fwd_bitmask, 32) > 1);