linux-merge June 2015

linux-merge@lists.open-mesh.org

3 participants
69 discussions

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

07 Jun '15

The following commit has been merged in the master branch: commit a0c77227ffd0ad371cfde84458f440bcde5ab048 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Mar 1 16:56:26 2015 +0100 batman-adv: Remove unnecessary check for orig_ifinfo not NULL orig_ifinfo is dereferenced multiple times in batadv_iv_ogm_update_seqnos before the check for NULL is done. The function also exists at the beginning when orig_ifinfo would have been NULL. This makes the check at the end unnecessary and only confuses the reader/code analyzers. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> 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 9f83137..4e93d2d 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1357,8 +1357,7 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, out: spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock); batadv_orig_node_free_ref(orig_node); - if (orig_ifinfo) - batadv_orig_ifinfo_free_ref(orig_ifinfo); + batadv_orig_ifinfo_free_ref(orig_ifinfo); return ret; } -- LinuxNextTracking

1 0

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

07 Jun '15

The following commit has been merged in the master branch: commit 564891510eb139dd073a0f1a5a7f5641b5bcc238 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:32 2014 +0100 batman-adv: iv_ogm_queue_add, Simplify expressions 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 190a642..159f30a 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -750,13 +750,13 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, unsigned long max_aggregation_jiffies; batadv_ogm_packet = (struct batadv_ogm_packet *)packet_buff; - direct_link = batadv_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0; + direct_link = !!(batadv_ogm_packet->flags & BATADV_DIRECTLINK); max_aggregation_jiffies = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS); /* find position for the packet in the forward queue */ spin_lock_bh(&bat_priv->forw_bat_list_lock); /* own packets are not to be aggregated */ - if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) { + if (atomic_read(&bat_priv->aggregated_ogms) && !own_packet) { hlist_for_each_entry(forw_packet_pos, &bat_priv->forw_bat_list, list) { if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet, -- LinuxNextTracking

1 0

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

07 Jun '15

The following commit has been merged in the master branch: commit 23badd6dbe5ed66668b0084950c5f66062923e10 Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:33 2014 +0100 batman-adv: iv_ogm_orig_update, style, add missing brackets CodingStyle describes that either none or both branches of a conditional have to have brackets. 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 159f30a..66ac9e8 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1032,9 +1032,10 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, batadv_orig_node_free_ref(orig_tmp); if (!neigh_node) goto unlock; - } else + } else { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Updating existing last-hop neighbor of originator\n"); + } rcu_read_unlock(); neigh_ifinfo = batadv_neigh_ifinfo_new(neigh_node, if_outgoing); -- LinuxNextTracking

1 0

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

07 Jun '15

The following commit has been merged in the master branch: commit 9f52ee19c3c73763138ccc307858d9877242c0ad Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:34 2014 +0100 batman-adv: iv_ogm, Fix dup_status comment 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 66ac9e8..23c41d1 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -28,7 +28,7 @@ /** * enum batadv_dup_status - duplicate status - * @BATADV_NO_DUP: the packet is a duplicate + * @BATADV_NO_DUP: the packet is no duplicate * @BATADV_ORIG_DUP: OGM is a duplicate in the originator (but not for the * neighbor) * @BATADV_NEIGH_DUP: OGM is a duplicate for the neighbor -- LinuxNextTracking

1 0

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

07 Jun '15

The following commit has been merged in the master branch: commit 6c4a1622e21fde1a0287ada3bedcbf75ddbc80ac Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:35 2014 +0100 batman-adv: iv_ogm, fix coding style The kernel coding style says, that there should not be multiple assignments in one row. 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 23c41d1..0019f1b 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -64,7 +64,9 @@ static void batadv_ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[]) { const uint8_t *ptr; - uint16_t count = 0, i = 0, sum = 0; + uint16_t count = 0; + uint16_t i = 0; + uint16_t sum = 0; ptr = lq_recv; -- LinuxNextTracking

1 0

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

07 Jun '15

The following commit has been merged in the master branch: commit 940d156f52d27c16f3e0890e82974d500e40e64f Author: Markus Pargmann <mpa(a)pengutronix.de> Date: Fri Dec 26 12:41:31 2014 +0100 batman-adv: iv_ogm_aggregate_new, simplify error handling It is just a bit easier to put the error handling at one place and let multiple error paths use the same calls. 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 c5ba7a7..190a642 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -642,19 +642,16 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, if (!batadv_atomic_dec_not_zero(&bat_priv->batman_queue_left)) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "batman packet queue full\n"); - goto out; + goto out_free_outgoing; } } forw_packet_aggr = kmalloc(sizeof(*forw_packet_aggr), GFP_ATOMIC); - if (!forw_packet_aggr) { - if (!own_packet) - atomic_inc(&bat_priv->batman_queue_left); - goto out; - } + if (!forw_packet_aggr) + goto out_nomem; - if ((atomic_read(&bat_priv->aggregated_ogms)) && - (packet_len < BATADV_MAX_AGGREGATION_BYTES)) + if (atomic_read(&bat_priv->aggregated_ogms) && + packet_len < BATADV_MAX_AGGREGATION_BYTES) skb_size = BATADV_MAX_AGGREGATION_BYTES; else skb_size = packet_len; @@ -662,12 +659,8 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, skb_size += ETH_HLEN; forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size); - if (!forw_packet_aggr->skb) { - if (!own_packet) - atomic_inc(&bat_priv->batman_queue_left); - kfree(forw_packet_aggr); - goto out; - } + if (!forw_packet_aggr->skb) + goto out_free_forw_packet; forw_packet_aggr->skb->priority = TC_PRIO_CONTROL; skb_reserve(forw_packet_aggr->skb, ETH_HLEN); @@ -699,7 +692,12 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, send_time - jiffies); return; -out: +out_free_forw_packet: + kfree(forw_packet_aggr); +out_nomem: + if (!own_packet) + atomic_inc(&bat_priv->batman_queue_left); +out_free_outgoing: batadv_hardif_free_ref(if_outgoing); out_free_incoming: batadv_hardif_free_ref(if_incoming); -- LinuxNextTracking

1 0

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

06 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 | 44 +---------- 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 | 56 ++++----------- net/batman-adv/main.h | 30 ++++---- 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 | 22 ----- 41 files changed, 264 insertions(+), 784 deletions(-)

1 0

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

05 Jun '15

1 0

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

04 Jun '15

1 0

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

03 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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge June 2015