diff options
| author |   Alexander Duyck <alexander.h.duyck@intel.com> | 2012-02-08 07:51:42 +0000 |
|---|---|---|
| committer |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-19 02:01:28 -0700 |
| commit | 6ca435078822d9728318dee49ba4f2ff8a2ead24 (patch) | |
| tree | e4ebabd2d72aa67f49546fac32c025b1654739db | |
| parent | ixgbe: drop err_eeprom tag which is at same location as err_sw_init (diff) | |
| download | linux-dev-6ca435078822d9728318dee49ba4f2ff8a2ead24.tar.xz linux-dev-6ca435078822d9728318dee49ba4f2ff8a2ead24.zip | |
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.
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>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 |
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; /* |