rtnl: fix msg size calculation in if_nlmsg_size()

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

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index b6c8a66..2b3f76f 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -29,7 +29,6 @@
 
 #ifdef CONFIG_SYSFS
 static const char fmt_hex[] = "%#x\n";
-static const char fmt_long_hex[] = "%#lx\n";
 static const char fmt_dec[] = "%d\n";
 static const char fmt_ulong[] = "%lu\n";
 static const char fmt_u64[] = "%llu\n";
@@ -199,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;
@@ -218,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;
@@ -574,6 +576,7 @@ NETSTAT_ENTRY(tx_heartbeat_errors);
 NETSTAT_ENTRY(tx_window_errors);
 NETSTAT_ENTRY(rx_compressed);
 NETSTAT_ENTRY(tx_compressed);
+NETSTAT_ENTRY(rx_nohandler);
 
 static struct attribute *netstat_attrs[] = {
        &dev_attr_rx_packets.attr,
@@ -599,6 +602,7 @@ static struct attribute *netstat_attrs[] = {
        &dev_attr_tx_window_errors.attr,
        &dev_attr_rx_compressed.attr,
        &dev_attr_tx_compressed.attr,
+       &dev_attr_rx_nohandler.attr,
        NULL
 };