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>,
kan.liang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org,
vidya-qUQiAmfTcIp+XZJcv9eMoEEOCMrvLtNR@public.gmane.org,
David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public.gmane.org>
Subject: [PATCH net-next v9 12/16] net: 8021q: use __ethtool_get_ksettings
Date: Wed, 24 Feb 2016 10:58:08 -0800 [thread overview]
Message-ID: <1456340292-26003-13-git-send-email-ddecotig@gmail.com> (raw)
In-Reply-To: <1456340292-26003-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/8021q/vlan_dev.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 055f0e9..e416a40 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -621,12 +621,12 @@ static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
return features;
}
-static int vlan_ethtool_get_settings(struct net_device *dev,
- struct ethtool_cmd *cmd)
+static int vlan_ethtool_get_link_ksettings(struct net_device *dev,
+ struct ethtool_link_ksettings *cmd)
{
const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
- return __ethtool_get_settings(vlan->real_dev, cmd);
+ return __ethtool_get_link_ksettings(vlan->real_dev, cmd);
}
static void vlan_ethtool_get_drvinfo(struct net_device *dev,
@@ -741,7 +741,7 @@ static int vlan_dev_get_iflink(const struct net_device *dev)
}
static const struct ethtool_ops vlan_ethtool_ops = {
- .get_settings = vlan_ethtool_get_settings,
+ .get_link_ksettings = vlan_ethtool_get_link_ksettings,
.get_drvinfo = vlan_ethtool_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_ts_info = vlan_ethtool_get_ts_info,
--
2.7.0.rc3.207.g0ac5344
next prev parent reply other threads:[~2016-02-24 18:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 18:57 [PATCH net-next v9 00/16] new ETHTOOL_GLINKSETTINGS/SLINKSETTINGS API David Decotigny
2016-02-24 18:57 ` [PATCH net-next v9 01/16] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny
2016-02-24 18:57 ` [PATCH net-next v9 02/16] net: usnic: use __ethtool_get_settings David Decotigny
2016-02-24 18:57 ` [PATCH net-next v9 03/16] net: ethtool: add new ETHTOOL_xLINKSETTINGS API David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 04/16] tx4939: use __ethtool_get_ksettings David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 06/16] net: bonding: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 07/16] net: ipvlan: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 08/16] net: macvlan: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 09/16] net: team: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 10/16] net: fcoe: " David Decotigny
[not found] ` <1456340292-26003-1-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-02-24 18:58 ` [PATCH net-next v9 05/16] net: usnic: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 11/16] net: rdma: " David Decotigny
2016-02-24 18:58 ` David Decotigny [this message]
2016-02-24 18:58 ` [PATCH net-next v9 13/16] net: bridge: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 14/16] net: core: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 15/16] net: ethtool: remove unused __ethtool_get_settings David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 16/16] 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=1456340292-26003-13-git-send-email-ddecotig@gmail.com \
--to=ddecotig-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=JBottomley-bzQdu9zFT3WakBO8gow8eQ@public.gmane.org \
--cc=VenkatKumar.Duvvuru-iH1Dq9VlAzfQT0dZR+AlfA@public.gmane.org \
--cc=Yuval.Mintz-h88ZbnxC6KDQT0dZR+AlfA@public.gmane.org \
--cc=_govind-KK0ffGbhmjU@public.gmane.org \
--cc=akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
--cc=ben-/+tVBieCtBitmTQ+vhA3Yw@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=decot-Ypc/8FJVVoBWk0Htik3J/w@public.gmane.org \
--cc=edumazet-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org \
--cc=eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public.gmane.org \
--cc=eugenia-VPRAkNaXOzVS1MOuV/RT9w@public.gmane.org \
--cc=fcoe-devel-s9riP+hp16TNLxjTenLetw@public.gmane.org \
--cc=idos-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=jeffrey.t.kirsher-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org \
--cc=kan.liang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org \
--cc=linux-qQsb+v5E8BnlAoU/VqSP6n9LOBIZ5rWg@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=ogerlitz-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=pshelar-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org \
--cc=robert.w.love-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=saeedm-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org \
--cc=tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=vidya-qUQiAmfTcIp+XZJcv9eMoEEOCMrvLtNR@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).