linux-merge July 2015

linux-merge@lists.open-mesh.org

3 participants
37 discussions

Build check errors found: 2015-08-01
by postmaster＠open-mesh.org 31 Jul '15

31 Jul '15

Name of failed tests ==================== * checkpatch next ./net/batman-adv/bat_iv_ogm.c * checkpatch next ./net/batman-adv/icmp_socket.c * checkpatch next ./net/batman-adv/network-coding.c * difference between net-next and batadv next * headers next Output of different failed tests ================================ checkpatch next ./net/batman-adv/bat_iv_ogm.c --------------------------------------------- WARNING: suspect code indent for conditional statements (16, 32) #972: FILE: ./net/batman-adv/bat_iv_ogm.c:972: + if (tmp_hard_iface->soft_iface != hard_iface->soft_iface) + continue; total: 0 errors, 1 warnings, 0 checks, 2009 lines checked 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/distributed-arp-table.c | 24 ++----- net/batman-adv/gateway_client.c | 10 +-- net/batman-adv/multicast.c | 79 ++++++------------------ net/batman-adv/network-coding.c | 6 - net/batman-adv/originator.c | 5 - net/batman-adv/send.c | 3 net/batman-adv/soft-interface.c | 10 --- net/batman-adv/translation-table.c | 45 +++---------- net/batman-adv/types.h | 15 +--- 9 files changed, 58 insertions(+), 139 deletions(-) headers next ------------ diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 0282690..774b005 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -22,9 +22,6 @@ #include <linux/types.h> -struct batadv_hard_iface; -struct batadv_orig_node; -struct batadv_priv; struct seq_file; struct sk_buff; diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 187acdc..80ab8d6 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -22,7 +22,6 @@ #include <linux/kconfig.h> -struct batadv_hard_iface; struct net_device; #define BATADV_DEBUGFS_SUBDIR "batman_adv" diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 1caf7d2..028eb6a 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -40,7 +41,6 @@ #include <linux/string.h> #include <linux/workqueue.h> #include <net/arp.h> - #include "hard-interface.h" #include "hash.h" #include "originator.h" diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index bd5c812..ab893e3 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -22,7 +22,6 @@ #include <linux/types.h> -struct batadv_priv; struct net_device; enum batadv_gw_modes { diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 7de7fce..e937143 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -23,7 +23,6 @@ #include <linux/types.h> struct batadv_icmp_header; -struct batadv_priv; #define BATADV_ICMP_SOCKET "socket" diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 8bdd69f..32d95c2 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -19,6 +19,8 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> +#include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -40,7 +42,6 @@ #include <linux/types.h> #include <net/addrconf.h> #include <net/ipv6.h> - #include "packet.h" #include "translation-table.h" diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index beb6e56..8f3cb04 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -20,8 +20,6 @@ #include "main.h" -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; /** diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 55a0b28..cfdc80d 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> #include <linux/debugfs.h> diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index 5b79aa8..8f6d4ad 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@ -22,11 +22,7 @@ #include <linux/types.h> -struct batadv_nc_node; -struct batadv_neigh_node; struct batadv_ogm_packet; -struct batadv_orig_node; -struct batadv_priv; struct net_device; struct seq_file; struct sk_buff; diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 6bc29d3..8557e69 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -22,10 +22,6 @@ #include <linux/types.h> -struct batadv_hard_iface; -struct batadv_neigh_node; -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; bool batadv_check_management_packet(struct sk_buff *skb, diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 0536835..78808b0 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -25,9 +25,6 @@ #include "packet.h" -struct batadv_hard_iface; -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; struct work_struct; diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 578e8a6..88be1fc 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,14 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" - #include <net/rtnetlink.h> +#include "main.h" -struct batadv_hard_iface; -struct batadv_orig_node; -struct batadv_priv; -struct batadv_softif_vlan; struct net_device; struct sk_buff; diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index 2294583..6197442 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -23,8 +23,6 @@ #include <linux/sysfs.h> #include <linux/types.h> -struct batadv_priv; -struct batadv_softif_vlan; struct kobject; struct net_device; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 7986ec5..63ef70a 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> @@ -42,7 +43,6 @@ #include <linux/string.h> #include <linux/workqueue.h> #include <net/net_namespace.h> - #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 6acc25d..eb5a200 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -22,8 +22,6 @@ #include <linux/types.h> -struct batadv_orig_node; -struct batadv_priv; struct net_device; struct seq_file;

1 0

Build check errors found: 2015-07-31
by postmaster＠open-mesh.org 30 Jul '15

30 Jul '15

1 0

Build check errors found: 2015-07-30
by postmaster＠open-mesh.org 29 Jul '15

29 Jul '15

1 0

Build check errors found: 2015-07-29
by postmaster＠open-mesh.org 28 Jul '15

28 Jul '15

1 0

Build check errors found: 2015-07-28
by postmaster＠open-mesh.org 27 Jul '15

27 Jul '15

1 0

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

27 Jul '15

1 0

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

26 Jul '15

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20150724
by batman＠open-mesh.org 25 Jul '15

25 Jul '15

The following commit has been merged in the master branch: commit 94d1dd87316fdb7a403a2750e13ec839fd2fadea Author: Antonio Quartulli <antonio(a)open-mesh.com> Date: Mon Mar 31 13:48:10 2014 +0200 batman-adv: change the MAC of each VLAN upon ndo_set_mac_address The MAC address of the soft-interface is used to initialise the "non-purge" TT entry of each existing VLAN. Therefore when the user invokes ndo_set_mac_address() all the "non-purge" TT entries have to be updated, not only the one belonging to the non-tagged network. Signed-off-by: Antonio Quartulli <antonio(a)open-mesh.com> 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 a859322..c002961 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -129,6 +129,7 @@ static struct net_device_stats *batadv_interface_stats(struct net_device *dev) static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) { struct batadv_priv *bat_priv = netdev_priv(dev); + struct batadv_softif_vlan *vlan; struct sockaddr *addr = p; uint8_t old_addr[ETH_ALEN]; @@ -139,12 +140,17 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) ether_addr_copy(dev->dev_addr, addr->sa_data); /* only modify transtable if it has been initialized before */ - if (atomic_read(&bat_priv->mesh_state) == BATADV_MESH_ACTIVE) { - batadv_tt_local_remove(bat_priv, old_addr, BATADV_NO_FLAGS, + if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) + return 0; + + rcu_read_lock(); + hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); - batadv_tt_local_add(dev, addr->sa_data, BATADV_NO_FLAGS, + batadv_tt_local_add(dev, addr->sa_data, vlan->vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); } + rcu_read_unlock(); return 0; } -- LinuxNextTracking

1 0

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

25 Jul '15

Name of failed tests ==================== * headers next Output of different failed tests ================================ headers next ------------ diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index 0282690..774b005 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -22,9 +22,6 @@ #include <linux/types.h> -struct batadv_hard_iface; -struct batadv_orig_node; -struct batadv_priv; struct seq_file; struct sk_buff; diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 187acdc..80ab8d6 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -22,7 +22,6 @@ #include <linux/kconfig.h> -struct batadv_hard_iface; struct net_device; #define BATADV_DEBUGFS_SUBDIR "batman_adv" diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c index 1caf7d2..028eb6a 100644 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -40,7 +41,6 @@ #include <linux/string.h> #include <linux/workqueue.h> #include <net/arp.h> - #include "hard-interface.h" #include "hash.h" #include "originator.h" diff --git a/net/batman-adv/gateway_common.h b/net/batman-adv/gateway_common.h index bd5c812..ab893e3 100644 --- a/net/batman-adv/gateway_common.h +++ b/net/batman-adv/gateway_common.h @@ -22,7 +22,6 @@ #include <linux/types.h> -struct batadv_priv; struct net_device; enum batadv_gw_modes { diff --git a/net/batman-adv/icmp_socket.h b/net/batman-adv/icmp_socket.h index 7de7fce..e937143 100644 --- a/net/batman-adv/icmp_socket.h +++ b/net/batman-adv/icmp_socket.h @@ -23,7 +23,6 @@ #include <linux/types.h> struct batadv_icmp_header; -struct batadv_priv; #define BATADV_ICMP_SOCKET "socket" diff --git a/net/batman-adv/multicast.c b/net/batman-adv/multicast.c index 8bdd69f..32d95c2 100644 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@ -19,6 +19,8 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> +#include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/errno.h> #include <linux/etherdevice.h> @@ -40,7 +42,6 @@ #include <linux/types.h> #include <net/addrconf.h> #include <net/ipv6.h> - #include "packet.h" #include "translation-table.h" diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index beb6e56..8f3cb04 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -20,8 +20,6 @@ #include "main.h" -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; /** diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c index 55a0b28..cfdc80d 100644 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> #include <linux/debugfs.h> diff --git a/net/batman-adv/network-coding.h b/net/batman-adv/network-coding.h index 5b79aa8..8f6d4ad 100644 --- a/net/batman-adv/network-coding.h +++ b/net/batman-adv/network-coding.h @@ -22,11 +22,7 @@ #include <linux/types.h> -struct batadv_nc_node; -struct batadv_neigh_node; struct batadv_ogm_packet; -struct batadv_orig_node; -struct batadv_priv; struct net_device; struct seq_file; struct sk_buff; diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 6bc29d3..8557e69 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -22,10 +22,6 @@ #include <linux/types.h> -struct batadv_hard_iface; -struct batadv_neigh_node; -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; bool batadv_check_management_packet(struct sk_buff *skb, diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 0536835..78808b0 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -25,9 +25,6 @@ #include "packet.h" -struct batadv_hard_iface; -struct batadv_orig_node; -struct batadv_priv; struct sk_buff; struct work_struct; diff --git a/net/batman-adv/soft-interface.h b/net/batman-adv/soft-interface.h index 578e8a6..88be1fc 100644 --- a/net/batman-adv/soft-interface.h +++ b/net/batman-adv/soft-interface.h @@ -18,14 +18,9 @@ #ifndef _NET_BATMAN_ADV_SOFT_INTERFACE_H_ #define _NET_BATMAN_ADV_SOFT_INTERFACE_H_ -#include "main.h" - #include <net/rtnetlink.h> +#include "main.h" -struct batadv_hard_iface; -struct batadv_orig_node; -struct batadv_priv; -struct batadv_softif_vlan; struct net_device; struct sk_buff; diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index 2294583..6197442 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -23,8 +23,6 @@ #include <linux/sysfs.h> #include <linux/types.h> -struct batadv_priv; -struct batadv_softif_vlan; struct kobject; struct net_device; diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 7986ec5..63ef70a 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -19,6 +19,7 @@ #include "main.h" #include <linux/atomic.h> +#include <linux/bitops.h> #include <linux/bug.h> #include <linux/byteorder/generic.h> #include <linux/compiler.h> @@ -42,7 +43,6 @@ #include <linux/string.h> #include <linux/workqueue.h> #include <net/net_namespace.h> - #include "bridge_loop_avoidance.h" #include "hard-interface.h" #include "hash.h" diff --git a/net/batman-adv/translation-table.h b/net/batman-adv/translation-table.h index 6acc25d..eb5a200 100644 --- a/net/batman-adv/translation-table.h +++ b/net/batman-adv/translation-table.h @@ -22,8 +22,6 @@ #include <linux/types.h> -struct batadv_orig_node; -struct batadv_priv; struct net_device; struct seq_file;

1 0

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

25 Jul '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

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge July 2015