From: David Decotigny <ddecotig@gmail.com>
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
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>
Subject: [PATCH net-next v2 08/17] net: macvlan: use __ethtool_get_ksettings
Date: Wed, 4 Feb 2015 11:53:32 -0800 [thread overview]
Message-ID: <1423079621-1374-9-git-send-email-ddecotig@gmail.com> (raw)
In-Reply-To: <1423079621-1374-1-git-send-email-ddecotig@gmail.com>
From: David Decotigny <decot@googlers.com>
Signed-off-by: David Decotigny <decot@googlers.com>
---
drivers/net/macvlan.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 1df38bd..ce934c3 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -925,12 +925,12 @@ static void macvlan_ethtool_get_drvinfo(struct net_device *dev,
strlcpy(drvinfo->version, "0.1", sizeof(drvinfo->version));
}
-static int macvlan_ethtool_get_settings(struct net_device *dev,
- struct ethtool_cmd *cmd)
+static int macvlan_ethtool_get_ksettings(struct net_device *dev,
+ struct ethtool_ksettings *cmd)
{
const struct macvlan_dev *vlan = netdev_priv(dev);
- return __ethtool_get_settings(vlan->lowerdev, cmd);
+ return __ethtool_get_ksettings(vlan->lowerdev, cmd);
}
static netdev_features_t macvlan_fix_features(struct net_device *dev,
@@ -998,7 +998,7 @@ static void macvlan_dev_netpoll_cleanup(struct net_device *dev)
static const struct ethtool_ops macvlan_ethtool_ops = {
.get_link = ethtool_op_get_link,
- .get_settings = macvlan_ethtool_get_settings,
+ .get_ksettings = macvlan_ethtool_get_ksettings,
.get_drvinfo = macvlan_ethtool_get_drvinfo,
};
--
2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-02-04 19:53 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-04 19:53 [PATCH net-next v2 00/17] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
[not found] ` <1423079621-1374-1-git-send-email-ddecotig-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-02-04 19:53 ` [PATCH net-next v2 01/17] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 02/17] net: usnic: use __ethtool_get_settings David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 14/17] net: core: use __ethtool_get_ksettings David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 15/17] net: ethtool: remove unused __ethtool_get_settings David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 17/17] net: mlx4: use new ETHTOOL_G/SSETTINGS API David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 03/17] net: ethtool: add new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 04/17] tx4939: use __ethtool_get_ksettings David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 05/17] net: usnic: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 06/17] net: bonding: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 07/17] net: ipvlan: " David Decotigny
2015-02-04 19:53 ` David Decotigny [this message]
2015-02-04 19:53 ` [PATCH net-next v2 09/17] net: team: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 10/17] net: fcoe: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 11/17] net: rdma: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 12/17] net: 8021q: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 13/17] net: bridge: " David Decotigny
2015-02-04 19:53 ` [PATCH net-next v2 16/17] net: mlx4: identify predicate for debug messages 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=1423079621-1374-9-git-send-email-ddecotig@gmail.com \
--to=ddecotig@gmail.com \
--cc=JBottomley@parallels.com \
--cc=VenkatKumar.Duvvuru@Emulex.Com \
--cc=_govind@gmx.com \
--cc=amirv@mellanox.com \
--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=eyalpe@mellanox.com \
--cc=fcoe-devel@open-fcoe.org \
--cc=idos@mellanox.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=joe@perches.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=pshelar@nicira.com \
--cc=robert.w.love@intel.com \
--cc=saeedm@mellanox.com \
--cc=umalhi@cisco.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).