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

On branch : master

commit 80c8988e598e73def8590ea4ac5905bdb7b1f8b9 Author: Sven Eckelmann sven@narfation.org Date: Mon Oct 31 08:36:26 2016 +0100

batman-adv: Revert "compat: Replace IFF_NO_QUEUE with 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 541c087012bd6b57d37f041aedc4d0b4440a96d1.

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

80c8988e598e73def8590ea4ac5905bdb7b1f8b9 compat-patches/0003-iff-no-queue.cocci | 9 --------- compat.h | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/compat-patches/0003-iff-no-queue.cocci b/compat-patches/0003-iff-no-queue.cocci deleted file mode 100644 index 9c95b85..0000000 --- a/compat-patches/0003-iff-no-queue.cocci +++ /dev/null @@ -1,9 +0,0 @@ -@@ -expression E; -@@ - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) - E->priv_flags |= IFF_NO_QUEUE; -+#else -+E->tx_queue_len = 0; -+#endif diff --git a/compat.h b/compat.h index 245621f..78de7ea 100644 --- a/compat.h +++ b/compat.h @@ -152,4 +152,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\

#endif /* < KERNEL_VERSION(4, 0, 0) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) + +#define IFF_NO_QUEUE 0; dev->tx_queue_len = 0 + +#endif /* < KERNEL_VERSION(4, 3, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */