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 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>, David Decotigny <decot@googlers.com> Subject: [PATCH net-next v1 13/18] net: 8021q: use __ethtool_get_ksettings Date: Mon, 26 Jan 2015 17:36:09 -0800 [thread overview] Message-ID: <1422322574-6188-14-git-send-email-ddecotig@gmail.com> (raw) In-Reply-To: <1422322574-6188-1-git-send-email-ddecotig@gmail.com> From: David Decotigny <decot@googlers.com> Signed-off-by: David Decotigny <decot@googlers.com> --- 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 1189564..b301bf6 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -655,12 +655,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_ksettings(struct net_device *dev, + struct ethtool_ksettings *cmd) { const struct vlan_dev_priv *vlan = vlan_dev_priv(dev); - return __ethtool_get_settings(vlan->real_dev, cmd); + return __ethtool_get_ksettings(vlan->real_dev, cmd); } static void vlan_ethtool_get_drvinfo(struct net_device *dev, @@ -768,7 +768,7 @@ static void vlan_dev_netpoll_cleanup(struct net_device *dev) #endif /* CONFIG_NET_POLL_CONTROLLER */ static const struct ethtool_ops vlan_ethtool_ops = { - .get_settings = vlan_ethtool_get_settings, + .get_ksettings = vlan_ethtool_get_ksettings, .get_drvinfo = vlan_ethtool_get_drvinfo, .get_link = ethtool_op_get_link, .get_ts_info = vlan_ethtool_get_ts_info, -- 2.2.0.rc0.207.ga3a616c
WARNING: multiple messages have this Message-ID (diff)
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>, Amir Vadai <amirv-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@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>, Eyal Perry <eyalpe-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>, Pravin B Shelar <pshelar-l0M0P4e3n4LQT0dZR+AlfA@public.gmane.org>, Ed Swierk <eswierk-FilZDy9cOaHkQYj/0HfcvtBPR1lH4CV8@public.gmane.org>, David Decotigny <decot-Ypc/8FJVVoBWk0Htik3J/w@public.gmane.org> Subject: [PATCH net-next v1 13/18] net: 8021q: use __ethtool_get_ksettings Date: Mon, 26 Jan 2015 17:36:09 -0800 [thread overview] Message-ID: <1422322574-6188-14-git-send-email-ddecotig@gmail.com> (raw) In-Reply-To: <1422322574-6188-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 1189564..b301bf6 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -655,12 +655,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_ksettings(struct net_device *dev, + struct ethtool_ksettings *cmd) { const struct vlan_dev_priv *vlan = vlan_dev_priv(dev); - return __ethtool_get_settings(vlan->real_dev, cmd); + return __ethtool_get_ksettings(vlan->real_dev, cmd); } static void vlan_ethtool_get_drvinfo(struct net_device *dev, @@ -768,7 +768,7 @@ static void vlan_dev_netpoll_cleanup(struct net_device *dev) #endif /* CONFIG_NET_POLL_CONTROLLER */ static const struct ethtool_ops vlan_ethtool_ops = { - .get_settings = vlan_ethtool_get_settings, + .get_ksettings = vlan_ethtool_get_ksettings, .get_drvinfo = vlan_ethtool_get_drvinfo, .get_link = ethtool_op_get_link, .get_ts_info = vlan_ethtool_get_ts_info, -- 2.2.0.rc0.207.ga3a616c
next prev parent reply other threads:[~2015-01-27 1:39 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-27 1:35 [PATCH net-next v1 00/18] RFC: new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny 2015-01-27 1:35 ` David Decotigny 2015-01-27 1:35 ` [PATCH net-next v1 01/18] net: ethtool: propagate get_settings error David Decotigny 2015-01-28 16:30 ` Ben Hutchings 2015-01-27 1:35 ` [PATCH net-next v1 02/18] net: usnic: remove unused call to ethtool_ops::get_settings David Decotigny 2015-01-27 1:35 ` [PATCH net-next v1 03/18] net: usnic: use __ethtool_get_settings David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 04/18] net: ethtool: add new ETHTOOL_GSETTINGS/SSETTINGS API David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 05/18] net: tx4939: use __ethtool_get_ksettings David Decotigny 2015-01-27 12:32 ` Sergei Shtylyov 2015-01-27 12:32 ` Sergei Shtylyov 2015-01-27 17:38 ` David Decotigny 2015-01-27 17:38 ` David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 06/18] net: usnic: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 07/18] net: bonding: " David Decotigny 2015-01-27 1:36 ` David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 08/18] net: ipvlan: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 09/18] net: macvlan: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 10/18] net: team: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 11/18] net: fcoe: " David Decotigny 2015-01-27 1:36 ` David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 12/18] net: rdma: " David Decotigny 2015-01-27 1:36 ` David Decotigny [this message] 2015-01-27 1:36 ` [PATCH net-next v1 13/18] net: 8021q: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 14/18] net: bridge: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 15/18] net: core: " David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 16/18] net: ethtool: remove unused __ethtool_get_settings David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 17/18] net: mlx4: identify predicate for debug messages David Decotigny 2015-01-27 1:36 ` [PATCH net-next v1 18/18] 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=1422322574-6188-14-git-send-email-ddecotig@gmail.com \ --to=ddecotig@gmail.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=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=netdev@vger.kernel.org \ --cc=ogerlitz@mellanox.com \ --cc=pshelar@nicira.com \ --cc=saeedm@mellanox.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.