linux-merge June 2015

linux-merge@lists.open-mesh.org

3 participants
69 discussions

Build check errors found: 2015-06-03
by postmaster＠open-mesh.org 02 Jun '15

02 Jun '15

Name of failed tests ==================== * checkpatch master ./net/batman-adv/icmp_socket.c * checkpatch master ./net/batman-adv/network-coding.c * checkpatch next ./net/batman-adv/icmp_socket.c * checkpatch next ./net/batman-adv/network-coding.c * difference between net-next and batadv next Output of different failed tests ================================ checkpatch next ./net/batman-adv/icmp_socket.c ---------------------------------------------- WARNING: line over 80 characters #340: FILE: ./net/batman-adv/icmp_socket.c:340: + * batadv_socket_receive_packet - schedule an icmp packet to be sent to userspace total: 0 errors, 1 warnings, 0 checks, 410 lines checked checkpatch next ./net/batman-adv/network-coding.c ------------------------------------------------- WARNING: line over 80 characters #875: FILE: ./net/batman-adv/network-coding.c:875: + * batadv_nc_update_nc_node - updates stored incoming and outgoing nc node structs total: 0 errors, 1 warnings, 0 checks, 1959 lines checked difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 90 ++++++++---------------- net/batman-adv/bitarray.c | 4 - net/batman-adv/bitarray.h | 6 - net/batman-adv/bridge_loop_avoidance.c | 54 +++++--------- net/batman-adv/bridge_loop_avoidance.h | 10 -- net/batman-adv/debugfs.c | 37 ++------- net/batman-adv/debugfs.h | 7 - net/batman-adv/distributed-arp-table.c | 45 +----------- net/batman-adv/distributed-arp-table.h | 13 --- net/batman-adv/fragmentation.c | 22 ----- net/batman-adv/fragmentation.h | 9 -- net/batman-adv/gateway_client.c | 39 +++------- net/batman-adv/gateway_client.h | 8 -- net/batman-adv/gateway_common.c | 11 -- net/batman-adv/gateway_common.h | 7 - net/batman-adv/hard-interface.c | 38 +++------- net/batman-adv/hard-interface.h | 11 -- net/batman-adv/hash.c | 6 - net/batman-adv/hash.h | 31 +++++--- net/batman-adv/icmp_socket.c | 33 +------- net/batman-adv/icmp_socket.h | 7 - net/batman-adv/main.c | 85 +++++++++------------- net/batman-adv/main.h | 34 ++++----- net/batman-adv/multicast.c | 29 ------- net/batman-adv/multicast.h | 6 - net/batman-adv/network-coding.c | 47 +++--------- net/batman-adv/network-coding.h | 13 --- net/batman-adv/originator.c | 34 ++------- net/batman-adv/originator.h | 26 +++--- net/batman-adv/packet.h | 3 net/batman-adv/routing.c | 36 ++------- net/batman-adv/routing.h | 10 -- net/batman-adv/send.c | 36 ++------- net/batman-adv/send.h | 13 --- net/batman-adv/soft-interface.c | 66 ++++------------- net/batman-adv/soft-interface.h | 11 -- net/batman-adv/sysfs.c | 60 +++++----------- net/batman-adv/sysfs.h | 10 -- net/batman-adv/translation-table.c | 89 +++++++++-------------- net/batman-adv/translation-table.h | 9 -- net/batman-adv/types.h | 29 +------ 41 files changed, 309 insertions(+), 825 deletions(-)

1 0

Build check errors found: 2015-06-02
by postmaster＠open-mesh.org 01 Jun '15

01 Jun '15

1 0

Coverity Scan: Analysis completed for alfred
by scan-admin＠coverity.com 01 Jun '15

01 Jun '15

Your request for analysis of alfred has been completed successfully. The results are available at https://scan.coverity.com/projects/2296 Analysis Summary: New defects found: 0 Defects eliminated: 0

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit 01b97a3eed3fe40e3a007d56935b421023bca2e3 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> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index ce04cd7..c5ba7a7 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/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; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit 8ea64e27080eb66dc26f64f28485c0bc9fc06b36 Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Mon May 11 20:34:52 2015 +0200 batman-adv: Use common declaration order in *_send_skb_(packet|unicast) Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index fa70ae8..23635bd 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -255,8 +255,8 @@ int batadv_send_skb_unicast(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, unsigned short vid) { - struct ethhdr *ethhdr; struct batadv_unicast_packet *unicast_packet; + struct ethhdr *ethhdr; int ret = NET_XMIT_DROP; if (!orig_node) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit dab7b62190c5abbe90eef4e9f9e7c28492e77eba 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> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 89e1d47..4cb70bb 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/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/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index d85a45c..9426b83 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -732,7 +732,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); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit 00f548bf5494ade996ae9c5e85c497dd2a3fdad5 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> diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 9426b83..50cf722 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -818,7 +818,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); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit fc1f86936651191ca51e532083206efb351ccd9c 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> diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 11d2d9f..026ba37 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/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/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 4cb70bb..b984bc4 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/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); } /** -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit 8f34b388786a952382c829453f280384f1bf3886 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> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index f9c5610..ce04cd7 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/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: -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150601
by batman＠open-mesh.org 01 Jun '15

01 Jun '15

The following commit has been merged in the master branch: commit 42d9f2cbd42e1ba137584da8305cf6f68b84f39d Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:26 2014 +0100 batman-adv: iv_ogm_iface_enable, direct return values Directly return error values. No need to use a return variable. Signed-off-by: Markus Pargmann <mpa(a)pengutronix.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index fc299c0..123aabb 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -308,7 +308,6 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) struct batadv_ogm_packet *batadv_ogm_packet; unsigned char *ogm_buff; uint32_t random_seqno; - int res = -ENOMEM; /* randomize initial seqno to avoid collision */ get_random_bytes(&random_seqno, sizeof(random_seqno)); @@ -317,7 +316,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); if (!ogm_buff) - goto out; + return -ENOMEM; hard_iface->bat_iv.ogm_buff = ogm_buff; @@ -329,10 +328,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->reserved = 0; batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; - res = 0; - -out: - return res; + return 0; } static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface) -- LinuxNextTracking

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge June 2015