compat: deactivate netdev_set_default_ethtool_ops() for some 3.7 kernels

netdev_set_default_ethtool_ops() was backported in 3.7.8 and compat
should not ship it on any more recent versions any more.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/compat/compat-3.8.c b/compat/compat-3.8.c
index b3d399c0aab970d04ffbbc2585b62b592186f552..8134323453ac60551b585efdb0e81e195d21f1d6 100644 (file)
--- a/compat/compat-3.8.c
+++ b/compat/compat-3.8.c
@@ -18,6 +18,7 @@
 #include "hid-ids.h"
 #include <linux/netdevice.h>
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,8))
 void netdev_set_default_ethtool_ops(struct net_device *dev,
                                    const struct ethtool_ops *ops)
 {
@@ -25,6 +26,7 @@ void netdev_set_default_ethtool_ops(struct net_device *dev,
                dev->ethtool_ops = ops;
 }
 EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);
+#endif
 
 /* a list of devices that shouldn't be handled by HID core at all */
 static const struct hid_device_id hid_ignore_list[] = {

diff --git a/include/linux/compat-3.8.h b/include/linux/compat-3.8.h
index 545e9f04f6eab4ad73038528b1397636a463931a..4aeffdba6408f16a621cfdf4bf944221a45d1d44 100644 (file)
--- a/include/linux/compat-3.8.h
+++ b/include/linux/compat-3.8.h
@@ -9,8 +9,10 @@
 #include <linux/netdevice.h>
 #include <linux/efi.h>
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,8))
 extern void netdev_set_default_ethtool_ops(struct net_device *dev,
                                           const struct ethtool_ops *ops);
+#endif
 
 #define HID_BUS_ANY                            0xffff
 #define HID_GROUP_ANY                          0x0000