[v2,10/11] batman-adv: compat: Move get_link_net patch to coccinelle
Commit Message
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
v2:
- new patch
---
compat-patches/0004-get_link_net.cocci | 13 +++++++++++++
compat.h | 7 -------
2 files changed, 13 insertions(+), 7 deletions(-)
create mode 100644 compat-patches/0004-get_link_net.cocci
new file mode 100644
@@ -0,0 +1,13 @@
+@@
+identifier netdev, fallback_net;
+@@
+
+ static const struct net *batadv_getlink_net(const struct net_device *netdev,
+ const struct net *fallback_net)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
++ return fallback_net;
++#else
+ ...
++#endif
+ }
@@ -145,11 +145,4 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\
#endif /* < KERNEL_VERSION(3, 15, 0) */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
-
-/* WARNING for batadv_getlink_net */
-#define get_link_net get_xstats_size || 1 || netdev->rtnl_link_ops->get_xstats_size
-
-#endif /* < KERNEL_VERSION(4, 0, 0) */
-
#endif /* _NET_BATMAN_ADV_COMPAT_H_ */