From: David Decotigny <ddecotig@gmail.com>
To: "David S. Miller" <davem@davemloft.net>,
Ben Hutchings <ben@decadent.org.uk>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-api@vger.kernel.org, linux-mips@linux-mips.org,
fcoe-devel@open-fcoe.org,
Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>
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>,
Pravin B Shelar <pshelar@nicira.com>,
Ed Swierk <eswierk@skyportsystems.com>,
Robert Love <robert.w.love@intel.com>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
Yuval Mintz <Yuval.Mintz@qlogic.com>,
Rasmus Villemoes <linux@rasmusvillemoes.dk>,
kan.liang@intel.com, vidya@cumulusnetworks.com,
David Decotigny <decot@googlers.com>
Subject: [PATCH net-next v9 07/16] net: ipvlan: use __ethtool_get_ksettings
Date: Wed, 24 Feb 2016 10:58:03 -0800 [thread overview]
Message-ID: <1456340292-26003-8-git-send-email-ddecotig@gmail.com> (raw)
In-Reply-To: <1456340292-26003-1-git-send-email-ddecotig@gmail.com>
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
drivers/net/ipvlan/ipvlan_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index a7ca1c5..5802b90 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -346,12 +346,12 @@ static const struct header_ops ipvlan_header_ops = {
.cache_update = eth_header_cache_update,
};
-static int ipvlan_ethtool_get_settings(struct net_device *dev,
- struct ethtool_cmd *cmd)
+static int ipvlan_ethtool_get_link_ksettings(struct net_device *dev,
+ struct ethtool_link_ksettings *cmd)
{
const struct ipvl_dev *ipvlan = netdev_priv(dev);
- return __ethtool_get_settings(ipvlan->phy_dev, cmd);
+ return __ethtool_get_link_ksettings(ipvlan->phy_dev, cmd);
}
static void ipvlan_ethtool_get_drvinfo(struct net_device *dev,
@@ -377,7 +377,7 @@ static void ipvlan_ethtool_set_msglevel(struct net_device *dev, u32 value)
static const struct ethtool_ops ipvlan_ethtool_ops = {
.get_link = ethtool_op_get_link,
- .get_settings = ipvlan_ethtool_get_settings,
+ .get_link_ksettings = ipvlan_ethtool_get_link_ksettings,
.get_drvinfo = ipvlan_ethtool_get_drvinfo,
.get_msglevel = ipvlan_ethtool_get_msglevel,
.set_msglevel = ipvlan_ethtool_set_msglevel,
--
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
[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 ` [PATCH net-next v9 12/16] net: 8021q: " David Decotigny
2016-02-24 18:58 ` [PATCH net-next v9 06/16] net: bonding: " David Decotigny
2016-02-24 18:58 ` David Decotigny [this message]
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
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-8-git-send-email-ddecotig@gmail.com \
--to=ddecotig@gmail.com \
--cc=JBottomley@parallels.com \
--cc=VenkatKumar.Duvvuru@Emulex.Com \
--cc=Yuval.Mintz@qlogic.com \
--cc=_govind@gmx.com \
--cc=akpm@linux-foundation.org \
--cc=ben@decadent.org.uk \
--cc=davem@davemloft.net \
--cc=decot@googlers.com \
--cc=edumazet@google.com \
--cc=eswierk@skyportsystems.com \
--cc=eugenia@mellanox.co.il \
--cc=fcoe-devel@open-fcoe.org \
--cc=idos@mellanox.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=joe@perches.com \
--cc=kan.liang@intel.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux@rasmusvillemoes.dk \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=pshelar@nicira.com \
--cc=robert.w.love@intel.com \
--cc=saeedm@mellanox.com \
--cc=tj@kernel.org \
--cc=vidya@cumulusnetworks.com \
/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).