lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 7 Feb 2016 17:08:58 -0800 From: David Decotigny <ddecotig@...il.com> To: "David S. Miller" <davem@...emloft.net>, Ben Hutchings <ben@...adent.org.uk>, linux-kernel@...r.kernel.org, netdev@...r.kernel.org, linux-api@...r.kernel.org, linux-mips@...ux-mips.org, fcoe-devel@...n-fcoe.org, Andrew Morton <akpm@...ux-foundation.org>, Tejun Heo <tj@...nel.org> Cc: Eric Dumazet <edumazet@...gle.com>, Eugenia Emantayev <eugenia@...lanox.co.il>, Or Gerlitz <ogerlitz@...lanox.com>, Ido Shamay <idos@...lanox.com>, Joe Perches <joe@...ches.com>, Saeed Mahameed <saeedm@...lanox.com>, Govindarajulu Varadarajan <_govind@....com>, Venkata Duvvuru <VenkatKumar.Duvvuru@...lex.Com>, Jeff Kirsher <jeffrey.t.kirsher@...el.com>, Pravin B Shelar <pshelar@...ira.com>, Ed Swierk <eswierk@...portsystems.com>, Robert Love <robert.w.love@...el.com>, "James E.J. Bottomley" <JBottomley@...allels.com>, Yuval Mintz <Yuval.Mintz@...gic.com>, Rasmus Villemoes <linux@...musvillemoes.dk>, David Decotigny <decot@...glers.com> Subject: [PATCH net-next v7 14/19] net: 8021q: use __ethtool_get_ksettings From: David Decotigny <decot@...glers.com> Signed-off-by: David Decotigny <decot@...glers.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 ad5e2fd..d4a6131 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_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, @@ -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_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.7.0.rc3.207.g0ac5344
Powered by blists - more mailing lists