Hi,
there seems to be 5 patches missing in batman-adv next which are already in net-next.git. Most likely the maintainers already know about them but at least one of them didn't reach the b.a.t.m.a.n mailing list.
* batman-adv: convert to using IFF_NO_QUEUE next (will be send as reply of this mail) * batman-adv: Fix memory leak on tt add with invalid vlan maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013560.html * batman-adv: Remove unnecessary braces for test_bit() in DAT maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013537.html * batman-adv: Remove unnecessary braces for test_bit() in NC maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013538.html * batman-adv: Remove unnecessary braces for test_bit() in MCAST maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013539.html
There are also a bunch of patches missing in net-next (see attachment). I highly recommend to format these patches with the git-format-patches option --histogram. Otherwise patch 4 ("batman-adv: move neigh_node list add into batadv_neigh_node_new()") becomes unreadable.
Kind regards, Sven
From: Phil Sutter phil@nwl.cc
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 --- Yes, I go the "route of shame" and added this weird hack. But at least I don't substract functions from each other. --- 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 05fb4f1a4e77..f6f8c44609f7 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 cce8e896d511..ac4d08de5df4 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
On Wednesday, August 26, 2015 10:24:41 Sven Eckelmann wrote:
From: Phil Sutter phil@nwl.cc
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
Yes, I go the "route of shame" and added this weird hack. But at least I don't substract functions from each other.
compat.h | 6 ++++++ net/batman-adv/soft-interface.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
Applied in revision 071aadb.
Thanks, Marek
On 26/08/15 10:23, Sven Eckelmann wrote:
Hi,
there seems to be 5 patches missing in batman-adv next which are already in net-next.git. Most likely the maintainers already know about them but at least one of them didn't reach the b.a.t.m.a.n mailing list.
- batman-adv: convert to using IFF_NO_QUEUE next (will be send as reply of this mail)
- batman-adv: Fix memory leak on tt add with invalid vlan maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013560.html
- batman-adv: Remove unnecessary braces for test_bit() in DAT maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013537.html
- batman-adv: Remove unnecessary braces for test_bit() in NC maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013538.html
- batman-adv: Remove unnecessary braces for test_bit() in MCAST maint https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2015-August/013539.html
There are also a bunch of patches missing in net-next (see attachment). I highly recommend to format these patches with the git-format-patches option --histogram. Otherwise patch 4 ("batman-adv: move neigh_node list add into batadv_neigh_node_new()") becomes unreadable.
All the patches in next and maint should have been merged net-next and net as of now.
Marek, could you please take care of merging these patches mentioned by Sven in next when you have time?
Thanks!
b.a.t.m.a.n@lists.open-mesh.org
-
Antonio Quartulli -
Marek Lindner -
Sven Eckelmann