commits November 2014

commits@lists.open-mesh.org

1 participants
63 discussions

[batman-adv] next: Merge branch 'maint' into next (b04458b)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit b04458b1f2a8f5778dd65464e703c1fe42648c23 Merge: df768d7 9e9d48e Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 16 16:55:43 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- b04458b1f2a8f5778dd65464e703c1fe42648c23 multicast.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

1 0

[batman-adv] maint: batman-adv: fix multicast counter when purging originators (9e9d48e)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9e9d48e829cd93ffbb5ced323caf046ebe963394 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Oct 30 05:40:47 2014 +0100 batman-adv: fix multicast counter when purging originators When purging an orig_node we should only decrease counter tracking the number of nodes without multicast optimizations support if it was increased through this orig_node before. A not yet quite initialized orig_node (meaning it did not have its turn in the mcast-tvlv handler so far) which gets purged would not adhere to this and will lead to a counter imbalance. Fixing this by adding a check whether the orig_node is mcast-initalized before decreasing the counter in the mcast-orig_node-purging routine. Introduced by 77ec494490d60d89b42cd01d5dbf8dee04503623 ("batman-adv: Announce new capability via multicast TVLV") Reported-by: Tobias Hachmer <tobias(a)hachmer.de> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9e9d48e829cd93ffbb5ced323caf046ebe963394 multicast.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multicast.c b/multicast.c index 02c2e0c..fe57bde 100644 --- a/multicast.c +++ b/multicast.c @@ -741,7 +741,8 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig) { struct batadv_priv *bat_priv = orig->bat_priv; - if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST)) + if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) && + orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST) atomic_dec(&bat_priv->mcast.num_disabled); batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);

1 0

[batman-adv] maint: batman-adv: fix counter for multicast supporting nodes (33fdd2c)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 33fdd2cb9fe20d90bc6bff369c9b57e849b317b6 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Thu Oct 30 05:40:46 2014 +0100 batman-adv: fix counter for multicast supporting nodes A miscounting of nodes having multicast optimizations enabled can lead to multicast packet loss in the following scenario: If the first OGM a node receives from another one has no multicast optimizations support (no multicast tvlv) then we are missing to increase the counter. This potentially leads to the wrong assumption that we could safely use multicast optimizations. Fixings this by increasing the counter if the initial OGM has the multicast TVLV unset, too. Introduced by 77ec494490d60d89b42cd01d5dbf8dee04503623 ("batman-adv: Announce new capability via multicast TVLV") Reported-by: Tobias Hachmer <tobias(a)hachmer.de> Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 33fdd2cb9fe20d90bc6bff369c9b57e849b317b6 multicast.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/multicast.c b/multicast.c index 96b66fd..02c2e0c 100644 --- a/multicast.c +++ b/multicast.c @@ -686,11 +686,13 @@ static void batadv_mcast_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, if (orig_initialized) atomic_dec(&bat_priv->mcast.num_disabled); orig->capabilities |= BATADV_ORIG_CAPA_HAS_MCAST; - /* If mcast support is being switched off increase the disabled - * mcast node counter. + /* If mcast support is being switched off or if this is an initial + * OGM without mcast support then increase the disabled mcast + * node counter. */ } else if (!orig_mcast_enabled && - orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) { + (orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST || + !orig_initialized)) { atomic_inc(&bat_priv->mcast.num_disabled); orig->capabilities &= ~BATADV_ORIG_CAPA_HAS_MCAST; }

1 0

[batman-adv] master's head updated: Merge branch 'next' (8dfbd63)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: df768d7 net: set name_assign_type in alloc_netdev() 8dfbd63 Merge branch 'next'

1 0

[batman-adv] master: Merge branch 'next' (8dfbd63)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 8dfbd638dcaa06347b4cc1c64bcc275dc5e87fb6 Merge: e7ba36c df768d7 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 16 13:50:05 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 8dfbd638dcaa06347b4cc1c64bcc275dc5e87fb6 compat.h | 10 ++++++++++ soft-interface.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[batman-adv] next: net: set name_assign_type in alloc_netdev() (df768d7)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit df768d79b9b2e5730e7474e7146af08434709574 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Jul 21 15:42:05 2014 +0200 net: set name_assign_type in alloc_netdev() Extend alloc_netdev{,_mq{,s}}() to take name_assign_type as argument, and convert all users to pass NET_NAME_UNKNOWN. Coccinelle patch: @@ expression sizeof_priv, name, setup, txqs, rxqs, count; @@ ( -alloc_netdev_mqs(sizeof_priv, name, setup, txqs, rxqs) +alloc_netdev_mqs(sizeof_priv, name, NET_NAME_UNKNOWN, setup, txqs, rxqs) | -alloc_netdev_mq(sizeof_priv, name, setup, count) +alloc_netdev_mq(sizeof_priv, name, NET_NAME_UNKNOWN, setup, count) | -alloc_netdev(sizeof_priv, name, setup) +alloc_netdev(sizeof_priv, name, NET_NAME_UNKNOWN, setup) ) v9: move comments here from the wrong commit Signed-off-by: Tom Gundersen <teg(a)jklm.no> Reviewed-by: David Herrmann <dh.herrmann(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sw: added compat code] Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- df768d79b9b2e5730e7474e7146af08434709574 compat.h | 10 ++++++++++ soft-interface.c | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/compat.h b/compat.h index acf903e..d3db201 100644 --- a/compat.h +++ b/compat.h @@ -452,6 +452,16 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #define hlist_add_behind(n, prev) hlist_add_after(prev, n) +/* alloc_netdev() was defined differently before 2.6.38 */ +#undef alloc_netdev +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) +#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ + alloc_netdev_mq(sizeof_priv, name, setup, 1) +#else +#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ + alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) +#endif /* nested < KERNEL_VERSION(2, 6, 38) */ + #endif /* < KERNEL_VERSION(3, 17, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/soft-interface.c b/soft-interface.c index 9bf382d..cfc2cd2 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -933,7 +933,7 @@ struct net_device *batadv_softif_create(const char *name) int ret; soft_iface = alloc_netdev(sizeof(struct batadv_priv), name, - batadv_softif_init_early); + NET_NAME_UNKNOWN, batadv_softif_init_early); if (!soft_iface) return NULL;

1 0

[batctl] master's head updated: Merge branch 'next' (6fb3e22)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 5b79358 batctl: add missing break in switch (MISSING_BREAK) 6fb3e22 Merge branch 'next'

1 0

[batctl] master: Merge branch 'next' (6fb3e22)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 6fb3e22c1bc9897c6de34c06161df7fc04f9b9b8 Merge: 36c6316 5b79358 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 16 13:42:09 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 6fb3e22c1bc9897c6de34c06161df7fc04f9b9b8 tcpdump.c | 1 + 1 file changed, 1 insertion(+)

1 0

[batctl] next: batctl: add missing break in switch (MISSING_BREAK) (5b79358)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 5b79358738c89d87e76f913d996abc53cf14a190 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Mon Nov 10 08:41:31 2014 +0100 batctl: add missing break in switch (MISSING_BREAK) Reported-by: Coverity Scan Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5b79358738c89d87e76f913d996abc53cf14a190 tcpdump.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tcpdump.c b/tcpdump.c index 50ba010..b994977 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -917,6 +917,7 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read case BATADV_UNICAST_4ADDR: if (dump_level & DUMP_TYPE_BATUCAST) dump_batman_4addr(packet_buff, buff_len, read_opt, time_printed); + break; case BATADV_UNICAST_TVLV: if ((dump_level & DUMP_TYPE_BATUCAST) || (dump_level & DUMP_TYPE_BATUTVLV))

1 0

[batman-adv] master: batman-adv: fix lock class for decoding hash in network-coding.c (e7ba36c)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit e7ba36c4ec9c8b4334a23fd5986306deca726b70 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Tue Nov 11 16:22:23 2014 +0100 batman-adv: fix lock class for decoding hash in network-coding.c batadv_has_set_lock_class() is called with the wrong hash table as first argument (probably due to a copy-paste error), which leads to false positives when running with lockdep. Introduced-by: 612d2b4fe0a1ff2f8389462a6f8be34e54124c05 ('batman-adv: network coding - save overheard and tx packets for decoding') Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e7ba36c4ec9c8b4334a23fd5986306deca726b70 network-coding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-coding.c b/network-coding.c index bd33894..127cc4d 100644 --- a/network-coding.c +++ b/network-coding.c @@ -133,7 +133,7 @@ int batadv_nc_mesh_init(struct batadv_priv *bat_priv) if (!bat_priv->nc.decoding_hash) goto err; - batadv_hash_set_lock_class(bat_priv->nc.coding_hash, + batadv_hash_set_lock_class(bat_priv->nc.decoding_hash, &batadv_nc_decoding_hash_lock_class_key); INIT_DELAYED_WORK(&bat_priv->nc.work, batadv_nc_worker);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2014