From d780ba844aa22883de1669127ed73675e217c5b5 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 15 May 2014 17:49:20 +0200 Subject: [PATCH 1/2] remove SET_ETHTOOL_OPS SET_ETHTOOL_OPS was removed in mainline Linux kernel in 7ad24ea4bf (net: get rid of SET_ETHTOOL_OPS). --- lib/C/kernel/nf2_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/C/kernel/nf2_ethtool.c b/lib/C/kernel/nf2_ethtool.c index 092ab749..01c63372 100644 --- a/lib/C/kernel/nf2_ethtool.c +++ b/lib/C/kernel/nf2_ethtool.c @@ -101,5 +101,5 @@ static const struct ethtool_ops nf2_ethtool_ops = { void nf2_set_ethtool_ops(struct net_device *dev) { - SET_ETHTOOL_OPS(dev, &nf2_ethtool_ops); + dev->ethtool_ops = &nf2_ethtool_ops; } From d7c4d900297be49d8bf0978df9f88e8dd0ef1399 Mon Sep 17 00:00:00 2001 From: Jakub Kicinski Date: Thu, 15 May 2014 17:50:02 +0200 Subject: [PATCH 2/2] remove .phys_id from ethops .phys_id was removed in mainline Linux kernel in 1ab7b6ac27 (ethtool: remove phys_id from ethtool_ops). --- lib/C/kernel/nf2_ethtool.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/C/kernel/nf2_ethtool.c b/lib/C/kernel/nf2_ethtool.c index 01c63372..8c410ac8 100644 --- a/lib/C/kernel/nf2_ethtool.c +++ b/lib/C/kernel/nf2_ethtool.c @@ -86,17 +86,11 @@ static void nf2_get_drvinfo(struct net_device *dev, } -static int nf2_phys_id(struct net_device *dev, __u32 data) -{ - return 0; -} - static const struct ethtool_ops nf2_ethtool_ops = { .get_settings = nf2_get_settings, .set_settings = nf2_set_settings, .get_drvinfo = nf2_get_drvinfo, .get_link = ethtool_op_get_link, - .phys_id = nf2_phys_id, }; void nf2_set_ethtool_ops(struct net_device *dev)