Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 3b79cd3d9b3eb920d17233b5270ee7162d55587e Author: Sven Eckelmann sven@narfation.org Date: Tue Oct 18 15:57:42 2016 +0200

batman-adv: compat: Move get_link_net patch to coccinelle

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

3b79cd3d9b3eb920d17233b5270ee7162d55587e compat-patches/0004-get_link_net.cocci | 13 +++++++++++++ compat.h | 7 ------- 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/compat-patches/0004-get_link_net.cocci b/compat-patches/0004-get_link_net.cocci new file mode 100644 index 0000000..1ae3192 --- /dev/null +++ b/compat-patches/0004-get_link_net.cocci @@ -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 + } diff --git a/compat.h b/compat.h index 245621f..2865eeb 100644 --- a/compat.h +++ b/compat.h @@ -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_ */