Commit 4d0710c2 authored by Andre Guedes's avatar Andre Guedes Committed by Jeff Kirsher
Browse files

igc: Get rid of igc_max_channels() 



The local function igc_max_channels() is a pointless wrapper around
igc_get_max_rss_queues(). This patch removes it and updates the callers
accordingly. It also does some cleanup on igc_get_max_rss_queues().

Signed-off-by: default avatarAndre Guedes <andre.guedes@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8e34cad1

drivers/net/ethernet/intel/igc/igc_ethtool.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -1508,18 +1508,13 @@ static int igc_set_rxfh(struct net_device *netdev, const u32 *indir, 
	return 0;

	return 0;

}

}





static unsigned int igc_max_channels(struct igc_adapter *adapter)

{

	return igc_get_max_rss_queues(adapter);

}



static void igc_get_channels(struct net_device *netdev,

static void igc_get_channels(struct net_device *netdev,

			     struct ethtool_channels *ch)

			     struct ethtool_channels *ch)

{

{

	struct igc_adapter *adapter = netdev_priv(netdev);

	struct igc_adapter *adapter = netdev_priv(netdev);





	/* Report maximum channels */

	/* Report maximum channels */

	ch->max_combined = igc_max_channels(adapter);

	ch->max_combined = igc_get_max_rss_queues(adapter);





	/* Report info for other vector */

	/* Report info for other vector */

	if (adapter->flags & IGC_FLAG_HAS_MSIX) {

	if (adapter->flags & IGC_FLAG_HAS_MSIX) {
@@ -1546,7 +1541,7 @@ static int igc_set_channels(struct net_device *netdev, 
		return -EINVAL;

		return -EINVAL;





	/* Verify the number of channels doesn't exceed hw limits */

	/* Verify the number of channels doesn't exceed hw limits */

	max_combined = igc_max_channels(adapter);

	max_combined = igc_get_max_rss_queues(adapter);

	if (count > max_combined)

	if (count > max_combined)

		return -EINVAL;

		return -EINVAL;

drivers/net/ethernet/intel/igc/igc_main.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -2731,12 +2731,7 @@ void igc_set_flag_queue_pairs(struct igc_adapter *adapter, 




unsigned int igc_get_max_rss_queues(struct igc_adapter *adapter)

unsigned int igc_get_max_rss_queues(struct igc_adapter *adapter)

{

{

	unsigned int max_rss_queues;

	return IGC_MAX_RX_QUEUES;



	/* Determine the maximum number of RSS queues supported. */

	max_rss_queues = IGC_MAX_RX_QUEUES;



	return max_rss_queues;

}

}





static void igc_init_queue_configuration(struct igc_adapter *adapter)

static void igc_init_queue_configuration(struct igc_adapter *adapter)

CRA Git | Maintained and supported by SUSTech CRA and CCSE