The following commit has been merged in the master branch: commit af20b710479ae662829cf739b521390daa7fcbcb Author: Andrew Lunn andrew@lunn.ch Date: Sun Apr 17 20:39:07 2011 +0200

batman-adv: Set the txqueuelen to zero when creating soft interface

Like other virtual interfaces, e.g. br0, we don't need a transmit queue. Packets should only be queued on real interfaces which are underneath. In practice this patch makes little difference since the virtual interfaces can accept packets as fast as they come, but the patch will avoid bufferbloat questions to the mailling lists in the future.

Signed-off-by: Andrew Lunn andrew@lunn.ch Tested-by: Linus Lüssing linus.luessing@web.de Signed-off-by: Marek Lindner lindner_marek@yahoo.de Signed-off-by: Sven Eckelmann sven@narfation.org

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index ad6da4c..58ce440 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -584,6 +584,7 @@ static void interface_setup(struct net_device *dev) dev->hard_start_xmit = interface_tx; #endif dev->destructor = free_netdev; + dev->tx_queue_len = 0;

/** * can't call min_mtu, because the needed variables