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

On branch : next

commit 071aadbb05e4f6ff1c25c5b1ef58f5158d31a8ac Author: Phil Sutter phil@nwl.cc Date: Wed Aug 26 10:24:41 2015 +0200

batman-adv: convert to using IFF_NO_QUEUE

Signed-off-by: Phil Sutter phil@nwl.cc Cc: Marek Lindner mareklindner@neomailbox.ch Cc: Simon Wunderlich sw@simonwunderlich.de Cc: Antonio Quartulli antonio@meshcoding.com Signed-off-by: David S. Miller davem@davemloft.net [sven@narfation.org: added compat hack] Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

071aadbb05e4f6ff1c25c5b1ef58f5158d31a8ac compat.h | 6 ++++++ net/batman-adv/soft-interface.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/compat.h b/compat.h index 05fb4f1..f6f8c44 100644 --- a/compat.h +++ b/compat.h @@ -170,4 +170,10 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\

#endif /* < KERNEL_VERSION(3, 10, 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_ */ diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index cce8e89..ac4d08d 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -941,7 +941,7 @@ static void batadv_softif_init_early(struct net_device *dev) dev->netdev_ops = &batadv_netdev_ops; dev->destructor = batadv_softif_free; dev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; - dev->tx_queue_len = 0; + dev->priv_flags |= IFF_NO_QUEUE;

/* can't call min_mtu, because the needed variables * have not been initialized yet