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

On branch : master

commit be1dd23242285f1c8be41ea89422dc71ee48dd0e Author: Sven Eckelmann sven@narfation.org Date: Mon Oct 31 08:36:24 2016 +0100

batman-adv: Revert "compat: Move vid api wrapper to coccinelle"

The coccinelle in Debian Jessie seems to be broken. It fails to parse the patches and thus makes it impossible to use the out-of-tree module in these systems. Therefore drop it for now.

This reverts commit 7f40f382af1125698ad149d1b743c2de70a5ad5c.

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

be1dd23242285f1c8be41ea89422dc71ee48dd0e compat-include/linux/netdevice.h | 6 --- compat-patches/0005-vid-callbacks.cocci | 74 --------------------------------- compat.h | 54 ++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 80 deletions(-)

diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 0536549..e71e614 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -28,12 +28,6 @@

#include <linux/netdev_features.h>

-#define __vid_api_returntype void - -#else - -#define __vid_api_returntype int - #endif /* < KERNEL_VERSION(3, 3, 0) */

#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) diff --git a/compat-patches/0005-vid-callbacks.cocci b/compat-patches/0005-vid-callbacks.cocci deleted file mode 100644 index 2cebc0e..0000000 --- a/compat-patches/0005-vid-callbacks.cocci +++ /dev/null @@ -1,74 +0,0 @@ -@ add_assignment @ -identifier batadv_interface_add_vid, batadv_netdev_ops; -@@ - - struct net_device_ops batadv_netdev_ops = { - .ndo_vlan_rx_add_vid = batadv_interface_add_vid, - }; - -@ kill_assignment @ -identifier batadv_interface_kill_vid, batadv_netdev_ops; -@@ - - struct net_device_ops batadv_netdev_ops = { - .ndo_vlan_rx_kill_vid = batadv_interface_kill_vid, - }; - -@ add_vid @ -identifier add_assignment.batadv_interface_add_vid; -type be16; -identifier dev, proto, vid; -@@ - --batadv_interface_add_vid -+batadv_interface_add_vid_orig - (struct net_device *dev, be16 proto, - unsigned short vid) - { ... } - -+static __vid_api_returntype batadv_interface_add_vid(struct net_device *dev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ be16 proto, -+#endif -+ unsigned short vid) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ be16 proto = htons(ETH_P_8021Q); -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) -+ batadv_interface_add_vid_orig(dev, proto, vid); -+#else -+ return batadv_interface_add_vid_orig(dev, proto, vid); -+#endif -+} - - -@ kill_vid @ -identifier kill_assignment.batadv_interface_kill_vid; -type be16; -identifier dev, proto, vid; -@@ - --batadv_interface_kill_vid -+batadv_interface_kill_vid_orig - (struct net_device *dev, be16 proto, - unsigned short vid) - { ... } - -+static __vid_api_returntype batadv_interface_kill_vid(struct net_device *dev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+ be16 proto, -+#endif -+ unsigned short vid) -+{ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) -+ be16 proto = htons(ETH_P_8021Q); -+#endif -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) -+ batadv_interface_kill_vid_orig(dev, proto, vid); -+#else -+ return batadv_interface_kill_vid_orig(dev, proto, vid); -+#endif -+} diff --git a/compat.h b/compat.h index d59fb5f..2865eeb 100644 --- a/compat.h +++ b/compat.h @@ -42,6 +42,31 @@

#endif /* < KERNEL_VERSION(3, 9, 0) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) + +#define batadv_interface_add_vid(x, y, z) \ +__batadv_interface_add_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid);\ +static void batadv_interface_add_vid(struct net_device *dev, unsigned short vid)\ +{\ + __batadv_interface_add_vid(dev, htons(ETH_P_8021Q), vid);\ +}\ +static int __batadv_interface_add_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid) + +#define batadv_interface_kill_vid(x, y, z) \ +__batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid);\ +static void batadv_interface_kill_vid(struct net_device *dev,\ + unsigned short vid)\ +{\ + __batadv_interface_kill_vid(dev, htons(ETH_P_8021Q), vid);\ +}\ +static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid) + +#endif /* < KERNEL_VERSION(3, 3, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)

#define batadv_interface_set_mac_addr(x, y) \ @@ -70,6 +95,35 @@ static int __batadv_interface_tx(struct sk_buff *skb, \

#endif /* < KERNEL_VERSION(3, 9, 0) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) + +#define batadv_interface_add_vid(x, y, z) \ +__batadv_interface_add_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid);\ +static int batadv_interface_add_vid(struct net_device *dev, unsigned short vid)\ +{\ + return __batadv_interface_add_vid(dev, htons(ETH_P_8021Q), vid);\ +}\ +static int __batadv_interface_add_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid) + +#define batadv_interface_kill_vid(x, y, z) \ +__batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid);\ +static int batadv_interface_kill_vid(struct net_device *dev,\ + unsigned short vid)\ +{\ + return __batadv_interface_kill_vid(dev, htons(ETH_P_8021Q), vid);\ +}\ +static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ + unsigned short vid) + +#endif /* >= KERNEL_VERSION(3, 3, 0) */ + +#endif /* < KERNEL_VERSION(3, 10, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)

/* the expected behaviour of this function is to return 0 on success, therefore