From: David Decotigny <ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public•gmane.org>
To: "David S. Miller" <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public•gmane.org>,
Ben Hutchings <ben-/+tVBieCtBitmTQ+vhA3Yw@public•gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
netdev-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-api-u79uwXL29TY76Z2rM5mHXA@public•gmane.org,
linux-mips-6z/3iImG2C8G8FEW9MqTrA@public•gmane.org,
fcoe-devel-s9riP+hp16TNLxjTenLetw@public•gmane.org,
Andrew Morton
<akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public•gmane.org>,
Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public•gmane.org>
Cc: Eric Dumazet <edumazet-hpIqsD4AKlfQT0dZR+AlfA@public•gmane.org>,
Eugenia Emantayev
<eugenia-VPRAkNaXOzVS1MOuV/RT9w@public•gmane.org>,
Or Gerlitz <ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org>,
Ido Shamay <idos-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org>,
Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public•gmane.org>,
Saeed Mahameed <saeedm-VPRAkNaXOzVWk0Htik3J/w@public•gmane.org>,
Govindarajulu Varadarajan <_govind-KK0ffGbhmjU@public•gmane.org>,
Venkata Duvvuru
<VenkatKumar.Duvvuru-iH1Dq9VlAzfQT0dZR+AlfA@public•gmane.org>,
Jeff Kirsher
<jeffrey.t.kirsher-ral2JQCrhuEAvxtiuMwx3w@public•gmane.org>,
Pravin B Shelar <pshelar-l0M0P4e3n4LQT0dZR+AlfA@public•gmane.org>,
Ed Swierk
<eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public•gmane.org>,
Robert Love
<robert.w.love-ral2JQCrhuEAvxtiuMwx3w@public•gmane.org>,
"James E.J. Bottomley"
<JBottomley-bzQdu9zFT3WakBO8gow8eQ@public•gmane.org>,
Yuval Mintz <Yuval.Mintz-h88ZbnxC6KDQT0dZR+AlfA@public•gmane.org>,
Rasmus Villemoes
<linux-qQsb+v5E8BnlAoU/VqSP6n9LOBIZ5rWg@public•gmane.org>,
David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public•gmane.org>
Subject: [PATCH net-next v7 16/19] net: core: use __ethtool_get_ksettings
Date: Sun, 7 Feb 2016 17:09:00 -0800 [thread overview]
Message-ID: <1454893743-6285-17-git-send-email-ddecotig@gmail.com> (raw)
In-Reply-To: <1454893743-6285-1-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
From: David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public•gmane.org>
Signed-off-by: David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public•gmane.org>
---
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 da7dbc2..b9c8b91 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -199,9 +199,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_ksettings cmd;
+
+ if (!__ethtool_get_ksettings(netdev, &cmd))
+ ret = sprintf(buf, fmt_dec, cmd.parent.speed);
}
rtnl_unlock();
return ret;
@@ -218,10 +219,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 992396a..626dae0 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -557,9 +557,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);
@@ -567,19 +566,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.7.0.rc3.207.g0ac5344
next prev parent reply other threads:[~2016-02-08 1:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 1:08 [PATCH net-next v7 00/19] new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 02/19] test_bitmap: unit tests for lib/bitmap.c David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 03/19] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 04/19] net: usnic: use __ethtool_get_settings David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 05/19] net: ethtool: add new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 06/19] tx4939: use __ethtool_get_ksettings David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 07/19] net: usnic: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 08/19] net: bonding: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 09/19] net: ipvlan: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 10/19] net: macvlan: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 11/19] net: team: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 12/19] net: fcoe: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 14/19] net: 8021q: " David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 15/19] net: bridge: " David Decotigny
[not found] ` <1454893743-6285-16-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-11 0:58 ` Stephen Hemminger
[not found] ` <1454893743-6285-1-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-08 1:08 ` [PATCH net-next v7 01/19] lib/bitmap.c: conversion routines to/from u32 array David Decotigny
[not found] ` <1454893743-6285-2-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-08 23:36 ` Andrew Morton
2016-02-10 0:30 ` David Decotigny
2016-02-08 1:08 ` [PATCH net-next v7 13/19] net: rdma: use __ethtool_get_ksettings David Decotigny
2016-02-08 1:09 ` David Decotigny [this message]
2016-02-08 1:09 ` [PATCH net-next v7 17/19] net: ethtool: remove unused __ethtool_get_settings David Decotigny
2016-02-08 1:09 ` [PATCH net-next v7 18/19] net: mlx4: convenience predicate for debug messages David Decotigny
2016-02-08 1:09 ` [PATCH net-next v7 19/19] net: mlx4: use new ETHTOOL_G/SSETTINGS API David Decotigny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454893743-6285-17-git-send-email-ddecotig@gmail.com \
--to=ddecotig-re5jqeeqqe8avxtiumwx3w@public$(echo .)gmane.org \
--cc=JBottomley-bzQdu9zFT3WakBO8gow8eQ@public$(echo .)gmane.org \
--cc=VenkatKumar.Duvvuru-iH1Dq9VlAzfQT0dZR+AlfA@public$(echo .)gmane.org \
--cc=Yuval.Mintz-h88ZbnxC6KDQT0dZR+AlfA@public$(echo .)gmane.org \
--cc=_govind-KK0ffGbhmjU@public$(echo .)gmane.org \
--cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public$(echo .)gmane.org \
--cc=ben-/+tVBieCtBitmTQ+vhA3Yw@public$(echo .)gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public$(echo .)gmane.org \
--cc=decot-Ypc/8FJVVoBWk0Htik3J/w@public$(echo .)gmane.org \
--cc=edumazet-hpIqsD4AKlfQT0dZR+AlfA@public$(echo .)gmane.org \
--cc=eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public$(echo .)gmane.org \
--cc=eugenia-VPRAkNaXOzVS1MOuV/RT9w@public$(echo .)gmane.org \
--cc=fcoe-devel-s9riP+hp16TNLxjTenLetw@public$(echo .)gmane.org \
--cc=idos-VPRAkNaXOzVWk0Htik3J/w@public$(echo .)gmane.org \
--cc=jeffrey.t.kirsher-ral2JQCrhuEAvxtiuMwx3w@public$(echo .)gmane.org \
--cc=joe-6d6DIl74uiNBDgjK7y7TUQ@public$(echo .)gmane.org \
--cc=linux-api-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=linux-mips-6z/3iImG2C8G8FEW9MqTrA@public$(echo .)gmane.org \
--cc=linux-qQsb+v5E8BnlAoU/VqSP6n9LOBIZ5rWg@public$(echo .)gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public$(echo .)gmane.org \
--cc=ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public$(echo .)gmane.org \
--cc=pshelar-l0M0P4e3n4LQT0dZR+AlfA@public$(echo .)gmane.org \
--cc=robert.w.love-ral2JQCrhuEAvxtiuMwx3w@public$(echo .)gmane.org \
--cc=saeedm-VPRAkNaXOzVWk0Htik3J/w@public$(echo .)gmane.org \
--cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public$(echo .)gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox