xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: use ethtool_cmd_speed_set helper to set ethtool speed value

Browse Source 
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko
2014-06-06 14:17:01 +02:00
committed by David S. Miller
parent 537fae0101
commit d4f3cd49d2
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/s390/net/qeth_core_main.c
View File

@@ -5726,6 +5726,7 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev,
struct qeth_card *card = netdev->ml_priv;
enum qeth_link_types link_type;
struct carrier_info carrier_info;
u32 speed;
if ((card->info.type == QETH_CARD_TYPE_IQD) || (card->info.guestlan))
link_type = QETH_LINK_TYPE_10GBIT_ETH;
@@ -5740,28 +5741,29 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev,
case QETH_LINK_TYPE_FAST_ETH:
case QETH_LINK_TYPE_LANE_ETH100:
qeth_set_ecmd_adv_sup(ecmd, SPEED_100, PORT_TP);
ecmd->speed = SPEED_100;
speed = SPEED_100;
ecmd->port = PORT_TP;
break;
case QETH_LINK_TYPE_GBIT_ETH:
case QETH_LINK_TYPE_LANE_ETH1000:
qeth_set_ecmd_adv_sup(ecmd, SPEED_1000, PORT_FIBRE);
ecmd->speed = SPEED_1000;
speed = SPEED_1000;
ecmd->port = PORT_FIBRE;
break;
case QETH_LINK_TYPE_10GBIT_ETH:
qeth_set_ecmd_adv_sup(ecmd, SPEED_10000, PORT_FIBRE);
ecmd->speed = SPEED_10000;
speed = SPEED_10000;
ecmd->port = PORT_FIBRE;
break;
default:
qeth_set_ecmd_adv_sup(ecmd, SPEED_10, PORT_TP);
ecmd->speed = SPEED_10;
speed = SPEED_10;
ecmd->port = PORT_TP;
}
ethtool_cmd_speed_set(ecmd, speed);
/* Check if we can obtain more accurate information. */
/* If QUERY_CARD_INFO command is not supported or fails, */
@@ -5806,18 +5808,19 @@ int qeth_core_ethtool_get_settings(struct net_device *netdev,
switch (carrier_info.port_speed) {
case CARD_INFO_PORTS_10M:
ecmd->speed = SPEED_10;
speed = SPEED_10;
break;
case CARD_INFO_PORTS_100M:
ecmd->speed = SPEED_100;
speed = SPEED_100;
break;
case CARD_INFO_PORTS_1G:
ecmd->speed = SPEED_1000;
speed = SPEED_1000;
break;
case CARD_INFO_PORTS_10G:
ecmd->speed = SPEED_10000;
speed = SPEED_10000;
break;
}
ethtool_cmd_speed_set(ecmd, speed);
return 0;
}