[linux-next] LinuxNextTracking branch, master, updated. next-20150819

batman at open-mesh.org batman at open-mesh.org
Thu Aug 20 00:15:45 CEST 2015

The following commit has been merged in the master branch:
commit cdf7370391d3a482ef2f2a8c73d16c6db3dbecf0
Author: Phil Sutter <phil at nwl.cc>
Date:   Tue Aug 18 10:30:44 2015 +0200

    net: batman-adv: convert to using IFF_NO_QUEUE
    Signed-off-by: Phil Sutter <phil at nwl.cc>
    Cc: Marek Lindner <mareklindner at neomailbox.ch>
    Cc: Simon Wunderlich <sw at simonwunderlich.de>
    Cc: Antonio Quartulli <antonio at meshcoding.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 51cda3a..49d3d3a 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


More information about the linux-merge mailing list