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

On branch : master

commit 541c087012bd6b57d37f041aedc4d0b4440a96d1 Author: Sven Eckelmann sven@narfation.org Date: Tue Oct 18 15:57:41 2016 +0200

batman-adv: compat: Replace IFF_NO_QUEUE with coccinelle

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

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

diff --git a/compat-patches/0003-iff-no-queue.cocci b/compat-patches/0003-iff-no-queue.cocci new file mode 100644 index 0000000..9c95b85 --- /dev/null +++ b/compat-patches/0003-iff-no-queue.cocci @@ -0,0 +1,9 @@ +@@ +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 78de7ea..245621f 100644 --- a/compat.h +++ b/compat.h @@ -152,10 +152,4 @@ 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_ */