1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6259619ec7e7..eb58f13773ad 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4332,8 +4332,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;
@@ -4354,7 +4352,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;
 
         /*