ixgbe: Two minor fixes for RSS and FDIR set queues functions

This change fixes two minor issues. The first was the fact that we were
setting the return value to false twice in the set_rss_queues function.
The second is the fact that we should have been using "min_t(int," instead
of "min((int)" in set_fdir_queues.

(cherry picked from commit 6ca435078822d9728318dee49ba4f2ff8a2ead24)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index a6041e9106b8f28eb564ebb793e07e07b44daa7c..b735bf7d76dfcbe0f80a9944d8407211f8564224 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4263,8 +4263,6 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
                adapter->num_rx_queues = f->indices;
                adapter->num_tx_queues = f->indices;
                ret = true;
-       } else {
-               ret = false;
        }
 
        return ret;
@@ -4285,7 +4283,7 @@ static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter)
        bool ret = false;
        struct ixgbe_ring_feature *f_fdir = &adapter->ring_feature[RING_F_FDIR];
 
-       f_fdir->indices = min((int)num_online_cpus(), f_fdir->indices);
+       f_fdir->indices = min_t(int, num_online_cpus(), f_fdir->indices);
        f_fdir->mask = 0;
 
        /*