Skip to content

Commit 5071bda

Browse files
aloktionJeff Kirsher
authored andcommitted
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: Aleksandr Loktionov <[email protected]> Signed-off-by: Piotr Kwapulinski <[email protected]> Signed-off-by: Tony Nguyen <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent e0ef26f commit 5071bda

File tree

4 files changed

+24
-29
lines changed

4 files changed

+24
-29
lines changed

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -291,27 +291,22 @@ static int iavf_get_link_ksettings(struct net_device *netdev,
291291
}
292292

293293
switch (adapter->link_speed) {
294-
case IAVF_LINK_SPEED_40GB:
294+
case VIRTCHNL_LINK_SPEED_40GB:
295295
cmd->base.speed = SPEED_40000;
296296
break;
297-
case IAVF_LINK_SPEED_25GB:
298-
#ifdef SPEED_25000
297+
case VIRTCHNL_LINK_SPEED_25GB:
299298
cmd->base.speed = SPEED_25000;
300-
#else
301-
netdev_info(netdev,
302-
"Speed is 25G, display not supported by this version of ethtool.\n");
303-
#endif
304299
break;
305-
case IAVF_LINK_SPEED_20GB:
300+
case VIRTCHNL_LINK_SPEED_20GB:
306301
cmd->base.speed = SPEED_20000;
307302
break;
308-
case IAVF_LINK_SPEED_10GB:
303+
case VIRTCHNL_LINK_SPEED_10GB:
309304
cmd->base.speed = SPEED_10000;
310305
break;
311-
case IAVF_LINK_SPEED_1GB:
306+
case VIRTCHNL_LINK_SPEED_1GB:
312307
cmd->base.speed = SPEED_1000;
313308
break;
314-
case IAVF_LINK_SPEED_100MB:
309+
case VIRTCHNL_LINK_SPEED_100MB:
315310
cmd->base.speed = SPEED_100;
316311
break;
317312
default:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2498,22 +2498,22 @@ static int iavf_validate_tx_bandwidth(struct iavf_adapter *adapter,
24982498
}
24992499

25002500
switch (adapter->link_speed) {
2501-
case IAVF_LINK_SPEED_40GB:
2501+
case VIRTCHNL_LINK_SPEED_40GB:
25022502
speed = 40000;
25032503
break;
2504-
case IAVF_LINK_SPEED_25GB:
2504+
case VIRTCHNL_LINK_SPEED_25GB:
25052505
speed = 25000;
25062506
break;
2507-
case IAVF_LINK_SPEED_20GB:
2507+
case VIRTCHNL_LINK_SPEED_20GB:
25082508
speed = 20000;
25092509
break;
2510-
case IAVF_LINK_SPEED_10GB:
2510+
case VIRTCHNL_LINK_SPEED_10GB:
25112511
speed = 10000;
25122512
break;
2513-
case IAVF_LINK_SPEED_1GB:
2513+
case VIRTCHNL_LINK_SPEED_1GB:
25142514
speed = 1000;
25152515
break;
2516-
case IAVF_LINK_SPEED_100MB:
2516+
case VIRTCHNL_LINK_SPEED_100MB:
25172517
speed = 100;
25182518
break;
25192519
default:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -379,19 +379,19 @@ static inline unsigned int iavf_itr_divisor(struct iavf_q_vector *q_vector)
379379
unsigned int divisor;
380380

381381
switch (q_vector->adapter->link_speed) {
382-
case IAVF_LINK_SPEED_40GB:
382+
case VIRTCHNL_LINK_SPEED_40GB:
383383
divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 1024;
384384
break;
385-
case IAVF_LINK_SPEED_25GB:
386-
case IAVF_LINK_SPEED_20GB:
385+
case VIRTCHNL_LINK_SPEED_25GB:
386+
case VIRTCHNL_LINK_SPEED_20GB:
387387
divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 512;
388388
break;
389389
default:
390-
case IAVF_LINK_SPEED_10GB:
390+
case VIRTCHNL_LINK_SPEED_10GB:
391391
divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 256;
392392
break;
393-
case IAVF_LINK_SPEED_1GB:
394-
case IAVF_LINK_SPEED_100MB:
393+
case VIRTCHNL_LINK_SPEED_1GB:
394+
case VIRTCHNL_LINK_SPEED_100MB:
395395
divisor = IAVF_ITR_ADAPTIVE_MIN_INC * 32;
396396
break;
397397
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -921,22 +921,22 @@ static void iavf_print_link_message(struct iavf_adapter *adapter)
921921
}
922922

923923
switch (adapter->link_speed) {
924-
case IAVF_LINK_SPEED_40GB:
924+
case VIRTCHNL_LINK_SPEED_40GB:
925925
link_speed_mbps = SPEED_40000;
926926
break;
927-
case IAVF_LINK_SPEED_25GB:
927+
case VIRTCHNL_LINK_SPEED_25GB:
928928
link_speed_mbps = SPEED_25000;
929929
break;
930-
case IAVF_LINK_SPEED_20GB:
930+
case VIRTCHNL_LINK_SPEED_20GB:
931931
link_speed_mbps = SPEED_20000;
932932
break;
933-
case IAVF_LINK_SPEED_10GB:
933+
case VIRTCHNL_LINK_SPEED_10GB:
934934
link_speed_mbps = SPEED_10000;
935935
break;
936-
case IAVF_LINK_SPEED_1GB:
936+
case VIRTCHNL_LINK_SPEED_1GB:
937937
link_speed_mbps = SPEED_1000;
938938
break;
939-
case IAVF_LINK_SPEED_100MB:
939+
case VIRTCHNL_LINK_SPEED_100MB:
940940
link_speed_mbps = SPEED_100;
941941
break;
942942
default:

0 commit comments

Comments
 (0)