Commit 5071bda2 authored by Aleksandr Loktionov's avatar Aleksandr Loktionov Committed by Jeff Kirsher
Browse files

iavf: use appropriate enum for comparison 



adapter->link_speed has type enum virtchnl_link_speed but our comparisons
are against enum iavf_aq_link_speed. Though they are, currently, the same
values, change the comparison to the matching enum virtchnl_link_speed
since that may not always be the case.

Signed-off-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: default avatarPiotr Kwapulinski <piotr.kwapulinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e0ef26fb

drivers/net/ethernet/intel/iavf/iavf_ethtool.c

+6 −11
Original line number Diff line number Diff line
@@ -291,27 +291,22 @@ static int iavf_get_link_ksettings(struct net_device *netdev, 
	}



	switch (adapter->link_speed) {

	case IAVF_LINK_SPEED_40GB:

	case VIRTCHNL_LINK_SPEED_40GB:

		cmd->base.speed = SPEED_40000;

		break;

	case IAVF_LINK_SPEED_25GB:

#ifdef SPEED_25000

	case VIRTCHNL_LINK_SPEED_25GB:

		cmd->base.speed = SPEED_25000;

#else

		netdev_info(netdev,

			    "Speed is 25G, display not supported by this version of ethtool.\n");

#endif

		break;

	case IAVF_LINK_SPEED_20GB:

	case VIRTCHNL_LINK_SPEED_20GB:

		cmd->base.speed = SPEED_20000;

		break;

	case IAVF_LINK_SPEED_10GB:

	case VIRTCHNL_LINK_SPEED_10GB:

		cmd->base.speed = SPEED_10000;

		break;

	case IAVF_LINK_SPEED_1GB:

	case VIRTCHNL_LINK_SPEED_1GB:

		cmd->base.speed = SPEED_1000;

		break;

	case IAVF_LINK_SPEED_100MB:

	case VIRTCHNL_LINK_SPEED_100MB:

		cmd->base.speed = SPEED_100;

		break;

	default:

drivers/net/ethernet/intel/iavf/iavf_main.c

+6 −6
Original line number Diff line number Diff line
@@ -2498,22 +2498,22 @@ static int iavf_validate_tx_bandwidth(struct iavf_adapter *adapter, 
	}



	switch (adapter->link_speed) {

	case IAVF_LINK_SPEED_40GB:

	case VIRTCHNL_LINK_SPEED_40GB:

		speed = 40000;

		break;

	case IAVF_LINK_SPEED_25GB:

	case VIRTCHNL_LINK_SPEED_25GB:

		speed = 25000;

		break;

	case IAVF_LINK_SPEED_20GB:

	case VIRTCHNL_LINK_SPEED_20GB:

		speed = 20000;

		break;

	case IAVF_LINK_SPEED_10GB:

	case VIRTCHNL_LINK_SPEED_10GB:

		speed = 10000;

		break;

	case IAVF_LINK_SPEED_1GB:

	case VIRTCHNL_LINK_SPEED_1GB:

		speed = 1000;

		break;

	case IAVF_LINK_SPEED_100MB:

	case VIRTCHNL_LINK_SPEED_100MB:

		speed = 100;

		break;

	default:

drivers/net/ethernet/intel/iavf/iavf_txrx.c

+6 −6
Original line number Diff line number Diff line
@@ -379,19 +379,19 @@ static inline unsigned int iavf_itr_divisor(struct iavf_q_vector *q_vector) 
	unsigned int divisor;



	switch (q_vector->adapter->link_speed) {

	case IAVF_LINK_SPEED_40GB:

	case VIRTCHNL_LINK_SPEED_40GB:

		divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 1024;

		break;

	case IAVF_LINK_SPEED_25GB:

	case IAVF_LINK_SPEED_20GB:

	case VIRTCHNL_LINK_SPEED_25GB:

	case VIRTCHNL_LINK_SPEED_20GB:

		divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 512;

		break;

	default:

	case IAVF_LINK_SPEED_10GB:

	case VIRTCHNL_LINK_SPEED_10GB:

		divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 256;

		break;

	case IAVF_LINK_SPEED_1GB:

	case IAVF_LINK_SPEED_100MB:

	case VIRTCHNL_LINK_SPEED_1GB:

	case VIRTCHNL_LINK_SPEED_100MB:

		divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 32;

		break;

	}

drivers/net/ethernet/intel/iavf/iavf_virtchnl.c

+6 −6
Original line number Diff line number Diff line
@@ -921,22 +921,22 @@ static void iavf_print_link_message(struct iavf_adapter *adapter) 
	}



	switch (adapter->link_speed) {

	case IAVF_LINK_SPEED_40GB:

	case VIRTCHNL_LINK_SPEED_40GB:

		link_speed_mbps = SPEED_40000;

		break;

	case IAVF_LINK_SPEED_25GB:

	case VIRTCHNL_LINK_SPEED_25GB:

		link_speed_mbps = SPEED_25000;

		break;

	case IAVF_LINK_SPEED_20GB:

	case VIRTCHNL_LINK_SPEED_20GB:

		link_speed_mbps = SPEED_20000;

		break;

	case IAVF_LINK_SPEED_10GB:

	case VIRTCHNL_LINK_SPEED_10GB:

		link_speed_mbps = SPEED_10000;

		break;

	case IAVF_LINK_SPEED_1GB:

	case VIRTCHNL_LINK_SPEED_1GB:

		link_speed_mbps = SPEED_1000;

		break;

	case IAVF_LINK_SPEED_100MB:

	case VIRTCHNL_LINK_SPEED_100MB:

		link_speed_mbps = SPEED_100;

		break;

	default:

CRA Git | Maintained and supported by SUSTech CRA and CCSE