linux-mips
[Top] [All Lists]

[PATCH net-next v2 14/17] net: core: use __ethtool_get_ksettings

To: "David S. Miller" <davem@davemloft.net>, Ben Hutchings <ben@decadent.org.uk>, Amir Vadai <amirv@mellanox.com>, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-mips@linux-mips.org, fcoe-devel@open-fcoe.org
Subject: [PATCH net-next v2 14/17] net: core: use __ethtool_get_ksettings
From: David Decotigny <ddecotig@gmail.com>
Date: Wed, 4 Feb 2015 11:53:38 -0800
Cc: Eric Dumazet <edumazet@google.com>, Eugenia Emantayev <eugenia@mellanox.co.il>, Or Gerlitz <ogerlitz@mellanox.com>, Ido Shamay <idos@mellanox.com>, Joe Perches <joe@perches.com>, Saeed Mahameed <saeedm@mellanox.com>, Govindarajulu Varadarajan <_govind@gmx.com>, Venkata Duvvuru <VenkatKumar.Duvvuru@Emulex.Com>, Jeff Kirsher <jeffrey.t.kirsher@intel.com>, Eyal Perry <eyalpe@mellanox.com>, Pravin B Shelar <pshelar@nicira.com>, Ed Swierk <eswierk@skyportsystems.com>, Upinder Malhi <umalhi@cisco.com>, Robert Love <robert.w.love@intel.com>, "James E.J. Bottomley" <JBottomley@parallels.com>, David Decotigny <decot@googlers.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=11ae12SgmJuAKDsK6iv/lx/h3tPrOAGcAuuJD+spll4=; b=GtB1bL6kqpZDhA9F9WufQaj334duaIXjnrsGAcaNy6ulZ9tXPC49dF33XqoQzxPWjc nVauWwaS0lMn74TXLf00vkLA59q4JuB/O4OLlRptvu+l+hbqRHRWi6lWfRYfg+a/vpto 9i6UOx++vl1gx54CafkV0aJ2GE8v7bY6Y3Pk4BBumf5r2r8k9FikDm7npUlocb0N7Gcp trqPa2bCoYlGAYKL7ZY33n4hWdwh2rdtnylvyfBGq5f1+hbdLpuHnX1lJJzejv5aFehg 7lglOCBR4QxplozRz1VeNJQ6v7SjCwHwmhWrF+x3MP3VHCsUimxi6pwHJokZOVLNqmx5 j9YQ==
In-reply-to: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 net/core/net-sysfs.c   | 15 +++++++++------
 net/packet/af_packet.c | 11 +++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 9993412..f54ae21 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -191,9 +191,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_udec, ethtool_cmd_speed(&cmd));
+               struct ethtool_ksettings cmd;
+
+               if (!__ethtool_get_ksettings(netdev, &cmd))
+                       ret = sprintf(buf, fmt_udec, cmd.parent.speed);
        }
        rtnl_unlock();
        return ret;
@@ -210,10 +211,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_ksettings cmd;
+
+               if (!__ethtool_get_ksettings(netdev, &cmd)) {
                        const char *duplex;
-                       switch (cmd.duplex) {
+
+                       switch (cmd.parent.duplex) {
                        case DUPLEX_HALF:
                                duplex = "half";
                                break;
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 9c28cec..fe2fcbe 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -554,9 +554,8 @@ static int prb_calc_retire_blk_tmo(struct packet_sock *po,
 {
        struct net_device *dev;
        unsigned int mbits = 0, msec = 0, div = 0, tmo = 0;
-       struct ethtool_cmd ecmd;
+       struct ethtool_ksettings ecmd;
        int err;
-       u32 speed;
 
        rtnl_lock();
        dev = __dev_get_by_index(sock_net(&po->sk), po->ifindex);
@@ -564,19 +563,19 @@ static int prb_calc_retire_blk_tmo(struct packet_sock *po,
                rtnl_unlock();
                return DEFAULT_PRB_RETIRE_TOV;
        }
-       err = __ethtool_get_settings(dev, &ecmd);
-       speed = ethtool_cmd_speed(&ecmd);
+       err = __ethtool_get_ksettings(dev, &ecmd);
        rtnl_unlock();
        if (!err) {
                /*
                 * If the link speed is so slow you don't really
                 * need to worry about perf anyways
                 */
-               if (speed < SPEED_1000 || speed == SPEED_UNKNOWN) {
+               if (ecmd.parent.speed < SPEED_1000 ||
+                   ecmd.parent.speed == SPEED_UNKNOWN) {
                        return DEFAULT_PRB_RETIRE_TOV;
                } else {
                        msec = 1;
-                       div = speed / 1000;
+                       div = ecmd.parent.speed / 1000;
                }
        }
 
-- 
2.2.0.rc0.207.ga3a616c


<Prev in Thread] Current Thread [Next in Thread>