commits February 2015

commits@lists.open-mesh.org

1 participants
26 discussions

[batman-adv] master: batman-adv: iv_ogm_orig_update, remove unnecessary brackets (442b546)
by postmaster＠open-mesh.org 20 Feb '15

20 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 442b5467d4d072462505a9650b5271753b18211c Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:30 2014 +0100 batman-adv: iv_ogm_orig_update, remove unnecessary brackets Remove these unnecessary brackets inside a condition. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 442b5467d4d072462505a9650b5271753b18211c bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 2b7a15d..9555aa6 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1081,7 +1081,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, * won't consider it either */ if (router_ifinfo && - (neigh_ifinfo->bat_iv.tq_avg == router_ifinfo->bat_iv.tq_avg)) { + neigh_ifinfo->bat_iv.tq_avg == router_ifinfo->bat_iv.tq_avg) { orig_node_tmp = router->orig_node; spin_lock_bh(&orig_node_tmp->bat_iv.ogm_cnt_lock); if_num = router->if_incoming->if_num;

1 0

[batman-adv] master: batman-adv: iv_ogm_can_aggregate, code readability (f7ac9a4)
by postmaster＠open-mesh.org 19 Feb '15

19 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit f7ac9a404f400e573644c8204e061e0c3934d1db Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:29 2014 +0100 batman-adv: iv_ogm_can_aggregate, code readability This patch tries to increase code readability by negating the first if block and rearranging some of the other conditional blocks. This way we save an indentation level, we also save some allocation that is not necessary for one of the conditions. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- f7ac9a404f400e573644c8204e061e0c3934d1db bat_iv_ogm.c | 102 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index bbcdbb4..2b7a15d 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -544,58 +544,62 @@ batadv_iv_ogm_can_aggregate(const struct batadv_ogm_packet *new_bat_ogm_packet, * - the send time is within our MAX_AGGREGATION_MS time * - the resulting packet wont be bigger than * MAX_AGGREGATION_BYTES + * otherwise aggregation is not possible */ - if (time_before(send_time, forw_packet->send_time) && - time_after_eq(aggregation_end_time, forw_packet->send_time) && - (aggregated_bytes <= BATADV_MAX_AGGREGATION_BYTES)) { - /* check aggregation compatibility - * -> direct link packets are broadcasted on - * their interface only - * -> aggregate packet if the current packet is - * a "global" packet as well as the base - * packet - */ - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; - - /* packet is not leaving on the same interface. */ - if (forw_packet->if_outgoing != if_outgoing) - goto out; + if (!time_before(send_time, forw_packet->send_time) || + !time_after_eq(aggregation_end_time, forw_packet->send_time)) + return false; + + if (aggregated_bytes > BATADV_MAX_AGGREGATION_BYTES) + return false; + + /* packet is not leaving on the same interface. */ + if (forw_packet->if_outgoing != if_outgoing) + return false; + + /* check aggregation compatibility + * -> direct link packets are broadcasted on + * their interface only + * -> aggregate packet if the current packet is + * a "global" packet as well as the base + * packet + */ + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + return false; - /* packets without direct link flag and high TTL - * are flooded through the net - */ - if ((!directlink) && - (!(batadv_ogm_packet->flags & BATADV_DIRECTLINK)) && - (batadv_ogm_packet->ttl != 1) && - - /* own packets originating non-primary - * interfaces leave only that interface - */ - ((!forw_packet->own) || - (forw_packet->if_incoming == primary_if))) { - res = true; - goto out; - } + /* packets without direct link flag and high TTL + * are flooded through the net + */ + if (!directlink && + !(batadv_ogm_packet->flags & BATADV_DIRECTLINK) && + batadv_ogm_packet->ttl != 1 && + + /* own packets originating non-primary + * interfaces leave only that interface + */ + (!forw_packet->own || + forw_packet->if_incoming == primary_if)) { + res = true; + goto out; + } - /* if the incoming packet is sent via this one - * interface only - we still can aggregate - */ - if ((directlink) && - (new_bat_ogm_packet->ttl == 1) && - (forw_packet->if_incoming == if_incoming) && - - /* packets from direct neighbors or - * own secondary interface packets - * (= secondary interface packets in general) - */ - (batadv_ogm_packet->flags & BATADV_DIRECTLINK || - (forw_packet->own && - forw_packet->if_incoming != primary_if))) { - res = true; - goto out; - } + /* if the incoming packet is sent via this one + * interface only - we still can aggregate + */ + if (directlink && + new_bat_ogm_packet->ttl == 1 && + forw_packet->if_incoming == if_incoming && + + /* packets from direct neighbors or + * own secondary interface packets + * (= secondary interface packets in general) + */ + (batadv_ogm_packet->flags & BATADV_DIRECTLINK || + (forw_packet->own && + forw_packet->if_incoming != primary_if))) { + res = true; + goto out; } out:

1 0

[batman-adv] master: batman-adv: checkpatch - spaces preferred around that '*' (5d4ff51)
by postmaster＠open-mesh.org 19 Feb '15

19 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 5d4ff51b0705e1b1124c73c1ba3006c261f5f539 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Feb 18 22:19:20 2015 +0800 batman-adv: checkpatch - spaces preferred around that '*' Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5d4ff51b0705e1b1124c73c1ba3006c261f5f539 main.h | 2 +- network-coding.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.h b/main.h index 515bf5a..b6c9ece 100644 --- a/main.h +++ b/main.h @@ -44,7 +44,7 @@ #define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ #define BATADV_TT_WORK_PERIOD 5000 /* 5 seconds */ #define BATADV_ORIG_WORK_PERIOD 1000 /* 1 second */ -#define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */ +#define BATADV_DAT_ENTRY_TIMEOUT (5 * 60000) /* 5 mins in milliseconds */ /* sliding packet range of received originator messages in sequence numbers * (should be a multiple of our word size) */ diff --git a/network-coding.c b/network-coding.c index be005b2..358e58c 100644 --- a/network-coding.c +++ b/network-coding.c @@ -275,7 +275,7 @@ static bool batadv_nc_to_purge_nc_path_decoding(struct batadv_priv *bat_priv, * max_buffer time */ return batadv_has_timed_out(nc_path->last_valid, - bat_priv->nc.max_buffer_time*10); + bat_priv->nc.max_buffer_time * 10); } /**

1 0

[batman-adv] master: batman-adv: checkpatch - comparison to NULL could be rewritten (4ce865d)
by postmaster＠open-mesh.org 19 Feb '15

19 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 4ce865db1b7dcc29acf9405291907a0ac8518883 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Feb 18 22:17:30 2015 +0800 batman-adv: checkpatch - comparison to NULL could be rewritten Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 4ce865db1b7dcc29acf9405291907a0ac8518883 soft-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soft-interface.c b/soft-interface.c index 22254fb..78d63e3 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -824,7 +824,7 @@ static int batadv_softif_slave_add(struct net_device *dev, int ret = -EINVAL; hard_iface = batadv_hardif_get_by_netdev(slave_dev); - if (!hard_iface || hard_iface->soft_iface != NULL) + if (!hard_iface || hard_iface->soft_iface) goto out; ret = batadv_hardif_enable_interface(hard_iface, dev->name);

1 0

[batman-adv] master: batman-adv: Use safer default config for optional features (453dea1)
by postmaster＠open-mesh.org 19 Feb '15

19 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 453dea19a89d84ff5bdf03d70f3269a619eba786 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Feb 18 18:20:24 2015 +0100 batman-adv: Use safer default config for optional features The current default settings for optional features in batman-adv seems to be based around the idea that the user only compiles what he requires. They will automatically enabled when they are compiled in. For example the network coding part of batman-adv is by default disabled in the out-of-tree module but will be enabled when the code is compiled during the module build. But distributions like Debian just enable all features of the batman-adv kernel module and hope that more experimental features or features with possible negative effects have to be enabled using some runtime configuration interface. The network_coding feature can help in specific setups but also has drawbacks and is not disabled by default in the out-of-tree module. Disabling by default in the runtime config seems to be also quite sane. The bridge_loop_avoidance is the only feature which is disabled by default but may be necessary even in simple setups. Packet loops may even be created during the initial node setup when this is not enabled. This is different than STP on bridges because mesh is usually used on Adhoc WiFi. Having two nodes (by accident) in the same LAN segment and in the same mesh network is rather common in this situation. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 453dea19a89d84ff5bdf03d70f3269a619eba786 network-coding.c | 2 +- soft-interface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/network-coding.c b/network-coding.c index 127cc4d..be005b2 100644 --- a/network-coding.c +++ b/network-coding.c @@ -155,7 +155,7 @@ err: */ void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv) { - atomic_set(&bat_priv->network_coding, 1); + atomic_set(&bat_priv->network_coding, 0); bat_priv->nc.min_tq = 200; bat_priv->nc.max_fwd_delay = 10; bat_priv->nc.max_buffer_time = 200; diff --git a/soft-interface.c b/soft-interface.c index 8748987..22254fb 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -738,7 +738,7 @@ static int batadv_softif_init_late(struct net_device *dev) atomic_set(&bat_priv->aggregated_ogms, 1); atomic_set(&bat_priv->bonding, 0); #ifdef CONFIG_BATMAN_ADV_BLA - atomic_set(&bat_priv->bridge_loop_avoidance, 0); + atomic_set(&bat_priv->bridge_loop_avoidance, 1); #endif #ifdef CONFIG_BATMAN_ADV_DAT atomic_set(&bat_priv->distributed_arp_table, 1);

1 0

[batman-adv] master: batman-adv: ignore netdev_set_master() calls on kernels older than 2.6.39 (3f74f35)
by postmaster＠open-mesh.org 19 Feb '15

19 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3f74f359cb7e96bbc68d62e1fc48b04b6efb4ca7 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Thu Feb 19 12:03:39 2015 +0800 batman-adv: ignore netdev_set_master() calls on kernels older than 2.6.39 batman-adv calls netdev_master_upper_dev_link() which is replaced with with netdev_set_master() for kernels older than 3.9 via compat.h. Prior to 2.6.39 netdev_set_master() contained Linux bonding calls needed to setup bonding devices. Calling this function from batman-adv leads to unexpected behavior when current batman-adv versions are used on these older kernels. To fix the situation compat.h now ships its own implementation of netdev_set_master() which does not change the net_dev->master state on kernels older than 2.6.39. Reported-by: Andreas Pape <APape(a)phoenixcontact.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3f74f359cb7e96bbc68d62e1fc48b04b6efb4ca7 compat.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/compat.h b/compat.h index 27d8a21..3b59e78 100644 --- a/compat.h +++ b/compat.h @@ -191,6 +191,15 @@ static inline int batadv_param_set_copystring(const char *val, #define kstrtoul strict_strtoul #define kstrtol strict_strtol +/* On older kernels net_dev->master is reserved for iface bonding. */ +static inline int batadv_netdev_set_master(struct net_device *slave, + struct net_device *master) +{ + return 0; +} + +#define netdev_set_master batadv_netdev_set_master + /* Hack for removing ndo_add/del_slave at the end of net_device_ops. * This is somewhat ugly because it requires that ndo_validate_addr * is at the end of this struct in soft-interface.c.

1 0

[batman-adv] master: batman-adv: IS_ENABLED compat code (1b49f8e)
by postmaster＠open-mesh.org 18 Feb '15

18 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 1b49f8e4ace1d036adffb98042d18c3f3eabacdd Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Feb 18 21:38:01 2015 +0800 batman-adv: IS_ENABLED compat code Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 1b49f8e4ace1d036adffb98042d18c3f3eabacdd compat.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/compat.h b/compat.h index 835c6ea..27d8a21 100644 --- a/compat.h +++ b/compat.h @@ -240,6 +240,19 @@ static inline void skb_reset_mac_len(struct sk_buff *skb) #endif /* < KERNEL_VERSION(3, 0, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0) + +#define __ARG_PLACEHOLDER_1 0, +#define config_enabled(cfg) _config_enabled(cfg) +#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value) +#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) +#define ___config_enabled(__ignored, val, ...) val + +#define IS_ENABLED(option) \ + (config_enabled(option) || config_enabled(option##_MODULE)) + +#endif /* < KERNEL_VERSION(3, 1, 0) */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #define batadv_interface_add_vid(x, y, z) \

1 0

[batman-adv] master: batman-adv: make gen-compat-autoconf.sh POSIX compliant (9081091)
by postmaster＠open-mesh.org 18 Feb '15

18 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 9081091d55ce814d4885a777cd224ce414361d6d Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Feb 18 17:19:33 2015 +0800 batman-adv: make gen-compat-autoconf.sh POSIX compliant Reported-by: Martin Müller <mail(a)mueller-martin.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9081091d55ce814d4885a777cd224ce414361d6d gen-compat-autoconf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index f625b6f..5a9a4e4 100755 --- a/gen-compat-autoconf.sh +++ b/gen-compat-autoconf.sh @@ -5,7 +5,7 @@ set -e TARGET=${1:="compat-autoconf.h"} TMP="${TARGET}.tmp" -echo -n > "${TMP}" +echo > "${TMP}" gen_config() { KEY="${1}"

1 0

[batman-adv] master: batman-adv: iv_ogm_send_to_if, declare char* as const (3de1d1b)
by postmaster＠open-mesh.org 18 Feb '15

18 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 3de1d1b9d1ee4f5fea77995d1bf217fd3a55d2ae Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:28 2014 +0100 batman-adv: iv_ogm_send_to_if, declare char* as const This string pointer is later assigned to a constant string, so it should be defined constant at the beginning. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 3de1d1b9d1ee4f5fea77995d1bf217fd3a55d2ae bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 5cd0e47..bbcdbb4 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -409,7 +409,7 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - char *fwd_str; + const char *fwd_str; uint8_t packet_num; int16_t buff_pos; struct batadv_ogm_packet *batadv_ogm_packet;

1 0

[batman-adv] master's head updated: Merge branch 'next' (ca2655c)
by postmaster＠open-mesh.org 18 Feb '15

18 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: c7203da batman-adv: Remove uses of return value of seq_printf ca2655c Merge branch 'next'

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2015