net: core: use __ethtool_get_ksettings

[cascardo/linux.git] / net / core / net-sysfs.c

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 4ae17c3..2b3f76f 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -198,9 +198,10 @@ static ssize_t speed_show(struct device *dev,
                return restart_syscall();
 
        if (netif_running(netdev)) {
-               struct ethtool_cmd cmd;
-               if (!__ethtool_get_settings(netdev, &cmd))
-                       ret = sprintf(buf, fmt_dec, ethtool_cmd_speed(&cmd));
+               struct ethtool_link_ksettings cmd;
+
+               if (!__ethtool_get_link_ksettings(netdev, &cmd))
+                       ret = sprintf(buf, fmt_dec, cmd.base.speed);
        }
        rtnl_unlock();
        return ret;
@@ -217,10 +218,12 @@ static ssize_t duplex_show(struct device *dev,
                return restart_syscall();
 
        if (netif_running(netdev)) {
-               struct ethtool_cmd cmd;
-               if (!__ethtool_get_settings(netdev, &cmd)) {
+               struct ethtool_link_ksettings cmd;
+
+               if (!__ethtool_get_link_ksettings(netdev, &cmd)) {
                        const char *duplex;
-                       switch (cmd.duplex) {
+
+                       switch (cmd.base.duplex) {
                        case DUPLEX_HALF:
                                duplex = "half";
                                break;