linux-merge

linux-merge@lists.open-mesh.org

3 participants
7480 discussions

Start a nNew thread

Build check errors found: 2016-05-12
by postmaster＠open-mesh.org 12 May '16

12 May '16

1 0

Build check errors found: 2016-05-11
by postmaster＠open-mesh.org 11 May '16

11 May '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master * sparse master linux-3.10 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.11 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.12 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.13 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.14 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.15 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.16 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.17 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.18 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.19 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.2 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.3 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.4 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.5 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.6 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.7 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.8 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-3.9 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-4.0 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-4.1 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-4.2 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-4.3 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-4.4 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * sparse master linux-4.5 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.10 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.11 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.12 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.13 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.14 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.15 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.16 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.17 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.18 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.19 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.2 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.3 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.4 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.5 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.6 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.7 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.8 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-3.9 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-4.0 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-4.1 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-4.2 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-4.3 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-4.4 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n * unused_symbols master linux-4.5 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 9 ++- netnext/net/batman-adv/bat_v.c | 66 +++------------------------ netnext/net/batman-adv/bat_v_elp.c | 31 +++--------- netnext/net/batman-adv/bat_v_elp.h | 2 netnext/net/batman-adv/originator.c | 6 -- 5 files changed, 24 insertions(+), 90 deletions(-) headers master -------------- diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 49e8023..c997878 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -17,8 +17,6 @@ #include "bat_algo.h" // IWYU pragma: keep #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h> sparse master linux-4.5 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n ------------------------------------------------------------------------ /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:689:31: error: no member 'bat_v' in struct batadv_hard_iface /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:691:31: error: no member 'bat_v' in struct batadv_hard_iface /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c: In function 'batadv_hardif_add_interface': /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:689:24: error: 'struct batadv_hard_iface' has no member named 'bat_v' atomic_set(&hard_iface->bat_v.throughput_override, 0); ^ /home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.c:691:24: error: 'struct batadv_hard_iface' has no member named 'bat_v' atomic_set(&hard_iface->bat_v.elp_interval, 500); ^ make[2]: *** [/home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv/hard-interface.o] Error 1 make[1]: *** [_module_/home/build_test/build_env/tmp.Fco0ibFY6r/net/batman-adv] Error 2 make: *** [all] Error 2 unused_symbols master linux-4.5 cfg: BLA=y DAT=y DEBUG=y NC=n MCAST=n BATMAN_V=n --------------------------------------------------------------------------- batadv_bla_check_bcast_duplist batadv_bla_free batadv_bla_init batadv_bla_is_backbone_gw batadv_bla_is_backbone_gw_orig batadv_bla_rx batadv_bla_status_update batadv_bla_tx batadv_bla_update_orig_address batadv_dat_drop_broadcast_packet batadv_dat_free batadv_dat_init batadv_dat_snoop_incoming_arp_reply batadv_dat_snoop_incoming_arp_request batadv_dat_snoop_outgoing_arp_reply batadv_dat_snoop_outgoing_arp_request batadv_dat_status_update batadv_debugfs_add_hardif batadv_debugfs_add_meshif batadv_debugfs_del_hardif batadv_debugfs_del_meshif batadv_debugfs_destroy batadv_debugfs_init batadv_frag_purge_orig batadv_frag_send_packet batadv_frag_skb_buffer batadv_frag_skb_fwd batadv_gw_bandwidth_set batadv_gw_check_client_stop batadv_gw_dhcp_recipient_get batadv_gw_election batadv_gw_free batadv_gw_get_selected_orig batadv_gw_init batadv_gw_node_delete batadv_gw_node_free batadv_gw_out_of_range batadv_gw_tvlv_container_update batadv_iv_init

1 0

Build check errors found: 2016-05-11
by postmaster＠open-mesh.org 11 May '16

11 May '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master * sparse master linux-3.16 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-3.16 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.16 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-3.16 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.17 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-3.17 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.17 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-3.17 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.18 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-3.18 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.18 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-3.18 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.19 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-3.19 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-3.19 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-3.19 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.0 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-4.0 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.0 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-4.0 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.1 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-4.1 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.1 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-4.1 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.2 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-4.2 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.2 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-4.2 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.3 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-4.3 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.3 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-4.3 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.4 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-4.4 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.4 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-4.4 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.5 cfg: BLA=n DAT=n DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse master linux-4.5 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse master linux-4.5 cfg: BLA=y DAT=n DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse master linux-4.5 cfg: BLA=y DAT=y DEBUG=y NC=y MCAST=n BATMAN_V=y * sparse next linux-3.10 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.11 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.12 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.13 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.13 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.14 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.14 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.15 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.15 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.16 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.16 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-3.16 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.16 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-3.17 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.17 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-3.17 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.17 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-3.18 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.18 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-3.18 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.18 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-3.19 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-3.19 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-3.19 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-3.19 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-3.9 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.0 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-4.0 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-4.0 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.0 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-4.1 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-4.1 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-4.1 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.1 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-4.2 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-4.2 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-4.2 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.2 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-4.3 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-4.3 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-4.3 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.3 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-4.4 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-4.4 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-4.4 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.4 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y * sparse next linux-4.5 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n * sparse next linux-4.5 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y * sparse next linux-4.5 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n * sparse next linux-4.5 cfg: BLA=y DAT=y DEBUG=n NC=n MCAST=n BATMAN_V=y Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 55 +- netnext/net/batman-adv/bat_v.c | 66 --- netnext/net/batman-adv/bat_v_elp.c | 31 - netnext/net/batman-adv/bat_v_elp.h | 2 netnext/net/batman-adv/bat_v_ogm.c | 14 netnext/net/batman-adv/bitarray.c | 16 netnext/net/batman-adv/bitarray.h | 15 netnext/net/batman-adv/bridge_loop_avoidance.c | 314 ++++------------ netnext/net/batman-adv/bridge_loop_avoidance.h | 43 +- netnext/net/batman-adv/debugfs.c | 2 netnext/net/batman-adv/distributed-arp-table.c | 6 netnext/net/batman-adv/gateway_client.c | 12 netnext/net/batman-adv/hard-interface.c | 34 - netnext/net/batman-adv/hard-interface.h | 3 netnext/net/batman-adv/hash.h | 6 netnext/net/batman-adv/main.c | 18 netnext/net/batman-adv/main.h | 6 netnext/net/batman-adv/network-coding.c | 27 - netnext/net/batman-adv/originator.c | 45 +- netnext/net/batman-adv/originator.h | 2 netnext/net/batman-adv/packet.h | 1 netnext/net/batman-adv/routing.c | 50 +- netnext/net/batman-adv/routing.h | 6 netnext/net/batman-adv/send.c | 6 netnext/net/batman-adv/soft-interface.c | 32 - netnext/net/batman-adv/soft-interface.h | 10 netnext/net/batman-adv/sysfs.c | 9 netnext/net/batman-adv/translation-table.c | 35 - netnext/net/batman-adv/types.h | 8 29 files changed, 319 insertions(+), 555 deletions(-) headers master -------------- diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 49e8023..c997878 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -17,8 +17,6 @@ #include "bat_algo.h" // IWYU pragma: keep #include "main.h" // IWYU pragma: keep - -#include <linux/atomic.h> #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h> sparse next linux-3.10 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n ----------------------------------------------------------------------- include/net/addrconf.h:298:25: warning: restricted __be64 degrades to integer include/net/addrconf.h:298:70: warning: restricted __be64 degrades to integer sparse next linux-3.11 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n ----------------------------------------------------------------------- include/net/addrconf.h:302:25: warning: restricted __be64 degrades to integer include/net/addrconf.h:302:70: warning: restricted __be64 degrades to integer sparse next linux-3.12 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n ----------------------------------------------------------------------- include/net/addrconf.h:310:25: warning: restricted __be64 degrades to integer include/net/addrconf.h:310:70: warning: restricted __be64 degrades to integer sparse next linux-3.13 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n ----------------------------------------------------------------------- /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression sparse next linux-3.13 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n ----------------------------------------------------------------------- /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: originally declared here /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here include/net/addrconf.h:310:25: warning: restricted __be64 degrades to integer include/net/addrconf.h:310:70: warning: restricted __be64 degrades to integer include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression include/linux/sysfs.h:455:9: warning: returning void-valued expression sparse next linux-3.14 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n ----------------------------------------------------------------------- /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression sparse next linux-3.14 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n ----------------------------------------------------------------------- /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: originally declared here /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here include/net/addrconf.h:318:25: warning: restricted __be64 degrades to integer include/net/addrconf.h:318:70: warning: restricted __be64 degrades to integer include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression include/linux/sysfs.h:432:9: warning: returning void-valued expression sparse next linux-3.15 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n ----------------------------------------------------------------------- include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/gateway_client.c:142:9: warning: Variable length array is used. /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/gateway_client.c:142:9: error: cannot size expression include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/hard-interface.c:243:9: warning: Variable length array is used. /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/hard-interface.c:243:9: error: cannot size expression include/linux/rculist.h:54:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression include/linux/rculist.h:54:9: warning: Variable length array is used. include/linux/rculist.h:54:9: error: cannot size expression include/linux/rculist.h:402:9: error: cannot size expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/routing.c:117:9: warning: Variable length array is used. /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/routing.c:117:9: error: cannot size expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression sparse next linux-3.15 cfg: BLA=n DAT=y DEBUG=y NC=y MCAST=y BATMAN_V=n ----------------------------------------------------------------------- include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: originally declared here include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/gateway_client.c:142:9: warning: Variable length array is used. /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/gateway_client.c:142:9: error: cannot size expression include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/hard-interface.c:243:9: warning: Variable length array is used. /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/hard-interface.c:243:9: error: cannot size expression include/linux/rculist.h:54:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression include/linux/rculist.h:54:9: warning: Variable length array is used. include/linux/rculist.h:54:9: error: cannot size expression include/linux/rculist.h:402:9: error: cannot size expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/routing.c:117:9: warning: Variable length array is used. /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/routing.c:117:9: error: cannot size expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/sysfs.h:440:9: warning: returning void-valued expression include/linux/rculist.h:402:9: warning: Variable length array is used. include/linux/rculist.h:402:9: error: cannot size expression sparse next linux-4.5 cfg: BLA=n DAT=y DEBUG=n NC=y MCAST=n BATMAN_V=n ---------------------------------------------------------------------- /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here sparse next linux-4.5 cfg: BLA=n DAT=y DEBUG=y NC=n MCAST=y BATMAN_V=y ---------------------------------------------------------------------- /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/debugfs.c:163:17: originally declared here /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: warning: symbol '__ret' shadows an earlier one /home/build_test/build_env/tmp.sYd3IVPN20/net/batman-adv/icmp_socket.c:144:17: originally declared here

1 0

Build check errors found: 2016-05-10
by postmaster＠open-mesh.org 10 May '16

10 May '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 55 +--- net/batman-adv/bat_v.c | 66 ----- net/batman-adv/bat_v_elp.c | 31 -- net/batman-adv/bat_v_elp.h | 2 net/batman-adv/bat_v_ogm.c | 14 - net/batman-adv/bitarray.c | 16 - net/batman-adv/bitarray.h | 15 - net/batman-adv/bridge_loop_avoidance.c | 314 ++++++------------------ net/batman-adv/bridge_loop_avoidance.h | 43 +-- net/batman-adv/debugfs.c | 2 net/batman-adv/distributed-arp-table.c | 6 net/batman-adv/gateway_client.c | 12 net/batman-adv/hard-interface.c | 34 +- net/batman-adv/hard-interface.h | 3 net/batman-adv/hash.h | 6 net/batman-adv/main.c | 18 - net/batman-adv/main.h | 6 net/batman-adv/network-coding.c | 27 +- net/batman-adv/originator.c | 45 ++- net/batman-adv/originator.h | 2 net/batman-adv/packet.h | 1 net/batman-adv/routing.c | 50 +-- net/batman-adv/routing.h | 6 net/batman-adv/send.c | 6 net/batman-adv/soft-interface.c | 32 +- net/batman-adv/soft-interface.h | 10 net/batman-adv/sysfs.c | 9 net/batman-adv/translation-table.c | 35 +- net/batman-adv/types.h | 8 29 files changed, 319 insertions(+), 555 deletions(-)

1 0

Build check errors found: 2016-05-09
by postmaster＠open-mesh.org 08 May '16

08 May '16

1 0

Build check errors found: 2016-05-08
by postmaster＠open-mesh.org 08 May '16

08 May '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 55 +--- net/batman-adv/bat_v.c | 66 ----- net/batman-adv/bat_v_elp.c | 31 -- net/batman-adv/bat_v_elp.h | 2 net/batman-adv/bat_v_ogm.c | 14 - net/batman-adv/bitarray.c | 16 - net/batman-adv/bitarray.h | 15 - net/batman-adv/bridge_loop_avoidance.c | 314 ++++++------------------ net/batman-adv/bridge_loop_avoidance.h | 43 +-- net/batman-adv/debugfs.c | 2 net/batman-adv/distributed-arp-table.c | 6 net/batman-adv/gateway_client.c | 12 net/batman-adv/hard-interface.c | 34 +- net/batman-adv/hard-interface.h | 3 net/batman-adv/hash.h | 6 net/batman-adv/main.c | 18 - net/batman-adv/main.h | 6 net/batman-adv/network-coding.c | 27 +- net/batman-adv/originator.c | 45 ++- net/batman-adv/originator.h | 2 net/batman-adv/packet.h | 1 net/batman-adv/routing.c | 50 +-- net/batman-adv/routing.h | 6 net/batman-adv/send.c | 6 net/batman-adv/soft-interface.c | 32 +- net/batman-adv/soft-interface.h | 10 net/batman-adv/sysfs.c | 9 net/batman-adv/translation-table.c | 35 +- net/batman-adv/types.h | 8 29 files changed, 319 insertions(+), 555 deletions(-) headers master -------------- diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index b2f47d4..8adc5fc 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -19,6 +19,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/atomic.h> +#include <linux/stddef.h> #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h>

1 0

Build check errors found: 2016-05-07
by postmaster＠open-mesh.org 06 May '16

06 May '16

Name of failed tests ==================== * difference between net-next and batadv next * headers master * headers next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 55 +--- net/batman-adv/bat_v.c | 55 ---- net/batman-adv/bat_v_ogm.c | 14 - net/batman-adv/bitarray.c | 16 - net/batman-adv/bitarray.h | 15 - net/batman-adv/bridge_loop_avoidance.c | 314 ++++++------------------ net/batman-adv/bridge_loop_avoidance.h | 43 +-- net/batman-adv/debugfs.c | 2 net/batman-adv/distributed-arp-table.c | 6 net/batman-adv/gateway_client.c | 12 net/batman-adv/hard-interface.c | 34 +- net/batman-adv/hard-interface.h | 3 net/batman-adv/hash.h | 6 net/batman-adv/main.c | 18 - net/batman-adv/main.h | 6 net/batman-adv/network-coding.c | 27 +- net/batman-adv/originator.c | 45 ++- net/batman-adv/originator.h | 2 net/batman-adv/packet.h | 1 net/batman-adv/routing.c | 50 +-- net/batman-adv/routing.h | 6 net/batman-adv/send.c | 6 net/batman-adv/soft-interface.c | 32 +- net/batman-adv/soft-interface.h | 10 net/batman-adv/sysfs.c | 9 net/batman-adv/translation-table.c | 35 +- net/batman-adv/types.h | 8 27 files changed, 310 insertions(+), 520 deletions(-) headers master -------------- diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 949f67c..c6cbb48 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -19,6 +19,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/atomic.h> +#include <linux/stddef.h> #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h> headers next ------------ diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 8bb422e..f8938ff 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -19,6 +19,7 @@ #include "main.h" // IWYU pragma: keep #include <linux/atomic.h> +#include <linux/stddef.h> #include <linux/bug.h> #include <linux/cache.h> #include <linux/init.h>

1 0

Build check errors found: 2016-05-06
by postmaster＠open-mesh.org 05 May '16

05 May '16

Name of failed tests ==================== * difference between net-next and batadv next Output of different failed tests ================================ difference between net-next and batadv next ------------------------------------------- net/batman-adv/bat_iv_ogm.c | 55 +--- net/batman-adv/bat_v.c | 26 - net/batman-adv/bat_v_ogm.c | 14 - net/batman-adv/bitarray.c | 16 - net/batman-adv/bitarray.h | 15 - net/batman-adv/bridge_loop_avoidance.c | 314 ++++++------------------ net/batman-adv/bridge_loop_avoidance.h | 43 +-- net/batman-adv/debugfs.c | 2 net/batman-adv/distributed-arp-table.c | 6 net/batman-adv/gateway_client.c | 12 net/batman-adv/hard-interface.c | 34 +- net/batman-adv/hard-interface.h | 3 net/batman-adv/hash.h | 6 net/batman-adv/main.c | 18 - net/batman-adv/main.h | 6 net/batman-adv/network-coding.c | 27 +- net/batman-adv/originator.c | 45 ++- net/batman-adv/originator.h | 2 net/batman-adv/packet.h | 1 net/batman-adv/routing.c | 50 +-- net/batman-adv/routing.h | 6 net/batman-adv/send.c | 6 net/batman-adv/soft-interface.c | 32 +- net/batman-adv/soft-interface.h | 10 net/batman-adv/sysfs.c | 9 net/batman-adv/translation-table.c | 35 +- net/batman-adv/types.h | 8 27 files changed, 306 insertions(+), 495 deletions(-)

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160505
by batman＠open-mesh.org 05 May '16

05 May '16

The following commit has been merged in the master branch: commit 5332174a83720921a5ef6db8080a8691f7ccbc27 Merge: e98a3aabf85f60b80c6ef93e509d38144ca434b1 64ae74455371a40bc9f9c8325eb4c37f2978c95f Author: David S. Miller <davem(a)davemloft.net> Date: Wed May 4 16:21:08 2016 -0400 Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Antonio Quartulli says: ==================== pull request: batman-adv 20160504 In this pull request you have: - two changes to the MAINTAINERS file where one marks our mailing list as moderated and the other adds a missing documentation file - kernel-doc fixes - code refactoring and various cleanups ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --combined MAINTAINERS index 867d6be,8f32094..2b74fde --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2203,10 -2203,13 +2203,13 @@@ BATMAN ADVANCE M: Marek Lindner <mareklindner(a)neomailbox.ch> M: Simon Wunderlich <sw(a)simonwunderlich.de> M: Antonio Quartulli <a(a)unstable.cc> - L: b.a.t.m.a.n(a)lists.open-mesh.org + L: b.a.t.m.a.n(a)lists.open-mesh.org (moderated for non-subscribers) W: https://www.open-mesh.org/ Q: https://patchwork.open-mesh.org/project/batman/list/ S: Maintained + F: Documentation/ABI/testing/sysfs-class-net-batman-adv + F: Documentation/ABI/testing/sysfs-class-net-mesh + F: Documentation/networking/batman-adv.txt F: net/batman-adv/ BAYCOM/HDLCDRV DRIVERS FOR AX.25 @@@ -4745,7 -4748,7 +4748,7 @@@ F: drivers/platform/x86/fujitsu-tablet. FUSE: FILESYSTEM IN USERSPACE M: Miklos Szeredi <miklos(a)szeredi.hu> -L: fuse-devel(a)lists.sourceforge.net +L: linux-fsdevel(a)vger.kernel.org W: http://fuse.sourceforge.net/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git S: Maintained @@@ -4904,7 -4907,7 +4907,7 @@@ F: net/ipv4/gre_offload. F: include/net/gre.h GRETH 10/100/1G Ethernet MAC device driver -M: Kristoffer Glembo <kristoffer(a)gaisler.com> +M: Andreas Larsson <andreas(a)gaisler.com> L: netdev(a)vger.kernel.org S: Maintained F: drivers/net/ethernet/aeroflex/ @@@ -6028,7 -6031,7 +6031,7 @@@ F: include/scsi/*iscsi ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR M: Or Gerlitz <ogerlitz(a)mellanox.com> -M: Sagi Grimberg <sagig(a)mellanox.com> +M: Sagi Grimberg <sagi(a)grimberg.me> M: Roi Dayan <roid(a)mellanox.com> L: linux-rdma(a)vger.kernel.org S: Supported @@@ -6038,7 -6041,7 +6041,7 @@@ Q: http://patchwork.kernel.org/project/ F: drivers/infiniband/ulp/iser/ ISCSI EXTENSIONS FOR RDMA (ISER) TARGET -M: Sagi Grimberg <sagig(a)mellanox.com> +M: Sagi Grimberg <sagi(a)grimberg.me> T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master L: linux-rdma(a)vger.kernel.org L: target-devel(a)vger.kernel.org @@@ -6401,7 -6404,7 +6404,7 @@@ F: mm/kmemleak. F: mm/kmemleak-test.c KPROBES -M: Ananth N Mavinakayanahalli <ananth(a)in.ibm.com> +M: Ananth N Mavinakayanahalli <ananth(a)linux.vnet.ibm.com> M: Anil S Keshavamurthy <anil.s.keshavamurthy(a)intel.com> M: "David S. Miller" <davem(a)davemloft.net> M: Masami Hiramatsu <mhiramat(a)kernel.org> @@@ -10015,8 -10018,7 +10018,8 @@@ F: drivers/infiniband/hw/ocrdma SFC NETWORK DRIVER M: Solarflare linux maintainers <linux-net-drivers(a)solarflare.com> -M: Shradha Shah <sshah(a)solarflare.com> +M: Edward Cree <ecree(a)solarflare.com> +M: Bert Kenward <bkenward(a)solarflare.com> L: netdev(a)vger.kernel.org S: Supported F: drivers/net/ethernet/sfc/ diff --combined net/batman-adv/bat_v.c index 4026f19,246f9e9..3ff8bd1 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@@ -32,21 -32,10 +32,21 @@@ #include "bat_v_elp.h" #include "bat_v_ogm.h" +#include "hard-interface.h" #include "hash.h" #include "originator.h" #include "packet.h" +static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface) +{ + /* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can + * set the interface as ACTIVE right away, without any risk of race + * condition + */ + if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED) + hard_iface->if_status = BATADV_IF_ACTIVE; +} + static int batadv_v_iface_enable(struct batadv_hard_iface *hard_iface) { int ret; @@@ -162,8 -151,8 +162,8 @@@ static void batadv_v_neigh_print(struc struct batadv_hard_iface *hard_iface; int batman_count = 0; - seq_printf(seq, " %-15s %s (%11s) [%10s]\n", "Neighbor", - "last-seen", "throughput", "IF"); + seq_puts(seq, + " Neighbor last-seen ( throughput) [ IF]\n"); rcu_read_lock(); list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) { @@@ -202,9 -191,8 +202,8 @@@ static void batadv_v_orig_print(struct int batman_count = 0; u32 i; - seq_printf(seq, " %-15s %s (%11s) %17s [%10s]: %20s ...\n", - "Originator", "last-seen", "throughput", "Nexthop", - "outgoingIF", "Potential nexthops"); + seq_puts(seq, + " Originator last-seen ( throughput) Nexthop [outgoingIF]: Potential nexthops ...\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -285,7 -273,6 +284,7 @@@ static bool batadv_v_neigh_is_sob(struc static struct batadv_algo_ops batadv_batman_v __read_mostly = { .name = "BATMAN_V", + .bat_iface_activate = batadv_v_iface_activate, .bat_iface_enable = batadv_v_iface_enable, .bat_iface_disable = batadv_v_iface_disable, .bat_iface_update_mac = batadv_v_iface_update_mac, diff --combined net/batman-adv/distributed-arp-table.c index 3e6b262,f0548b4..67f44f5 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -152,7 -152,7 +152,7 @@@ static void batadv_dat_purge(struct wor struct batadv_priv_dat *priv_dat; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_dat = container_of(delayed_work, struct batadv_priv_dat, work); bat_priv = container_of(priv_dat, struct batadv_priv, dat); @@@ -568,7 -568,6 +568,7 @@@ static void batadv_choose_next_candidat * be sent to * @bat_priv: the bat priv with all the soft interface information * @ip_dst: ipv4 to look up in the DHT + * @vid: VLAN identifier * * An originator O is selected if and only if its DHT_ID value is one of three * closest values (from the LEFT, with wrap around if needed) then the hash @@@ -577,8 -576,7 +577,8 @@@ * Return: the candidate array of size BATADV_DAT_CANDIDATE_NUM. */ static struct batadv_dat_candidate * -batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst) +batadv_dat_select_candidates(struct batadv_priv *bat_priv, __be32 ip_dst, + unsigned short vid) { int select; batadv_dat_addr_t last_max = BATADV_DAT_ADDR_MAX, ip_key; @@@ -594,7 -592,7 +594,7 @@@ return NULL; dat.ip = ip_dst; - dat.vid = 0; + dat.vid = vid; ip_key = (batadv_dat_addr_t)batadv_hash_dat(&dat, BATADV_DAT_ADDR_MAX); @@@ -614,7 -612,6 +614,7 @@@ * @bat_priv: the bat priv with all the soft interface information * @skb: payload to send * @ip: the DHT key + * @vid: VLAN identifier * @packet_subtype: unicast4addr packet subtype to use * * This function copies the skb with pskb_copy() and is sent as unicast packet @@@ -625,7 -622,7 +625,7 @@@ */ static bool batadv_dat_send_data(struct batadv_priv *bat_priv, struct sk_buff *skb, __be32 ip, - int packet_subtype) + unsigned short vid, int packet_subtype) { int i; bool ret = false; @@@ -634,7 -631,7 +634,7 @@@ struct sk_buff *tmp_skb; struct batadv_dat_candidate *cand; - cand = batadv_dat_select_candidates(bat_priv, ip); + cand = batadv_dat_select_candidates(bat_priv, ip, vid); if (!cand) goto out; @@@ -720,7 -717,7 +720,7 @@@ void batadv_dat_status_update(struct ne } /** - * batadv_gw_tvlv_ogm_handler_v1 - process incoming dat tvlv container + * batadv_dat_tvlv_ogm_handler_v1 - process incoming dat tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm * @flags: flags indicating the tvlv state (see batadv_tvlv_handler_flags) @@@ -817,8 -814,8 +817,8 @@@ int batadv_dat_cache_seq_print_text(str goto out; seq_printf(seq, "Distributed ARP Table (%s):\n", net_dev->name); - seq_printf(seq, " %-7s %-9s %4s %11s\n", "IPv4", - "MAC", "VID", "last-seen"); + seq_puts(seq, + " IPv4 MAC VID last-seen\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -1025,7 -1022,7 +1025,7 @@@ bool batadv_dat_snoop_outgoing_arp_requ ret = true; } else { /* Send the request to the DHT */ - ret = batadv_dat_send_data(bat_priv, skb, ip_dst, + ret = batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_GET); } out: @@@ -1153,8 -1150,8 +1153,8 @@@ void batadv_dat_snoop_outgoing_arp_repl /* Send the ARP reply to the candidates for both the IP addresses that * the node obtained from the ARP reply */ - batadv_dat_send_data(bat_priv, skb, ip_src, BATADV_P_DAT_DHT_PUT); - batadv_dat_send_data(bat_priv, skb, ip_dst, BATADV_P_DAT_DHT_PUT); + batadv_dat_send_data(bat_priv, skb, ip_src, vid, BATADV_P_DAT_DHT_PUT); + batadv_dat_send_data(bat_priv, skb, ip_dst, vid, BATADV_P_DAT_DHT_PUT); } /** diff --combined net/batman-adv/originator.c index c355a82,155c1dd..f885a41 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -250,6 -250,7 +250,6 @@@ static void batadv_neigh_node_release(s { struct hlist_node *node_tmp; struct batadv_neigh_node *neigh_node; - struct batadv_hardif_neigh_node *hardif_neigh; struct batadv_neigh_ifinfo *neigh_ifinfo; struct batadv_algo_ops *bao; @@@ -261,7 -262,13 +261,7 @@@ batadv_neigh_ifinfo_put(neigh_ifinfo); } - hardif_neigh = batadv_hardif_neigh_get(neigh_node->if_incoming, - neigh_node->addr); - if (hardif_neigh) { - /* batadv_hardif_neigh_get() increases refcount too */ - batadv_hardif_neigh_put(hardif_neigh); - batadv_hardif_neigh_put(hardif_neigh); - } + batadv_hardif_neigh_put(neigh_node->hardif_neigh); if (bao->bat_neigh_free) bao->bat_neigh_free(neigh_node); @@@ -282,7 -289,7 +282,7 @@@ void batadv_neigh_node_put(struct batad } /** - * batadv_orig_node_get_router - router to the originator depending on iface + * batadv_orig_router_get - router to the originator depending on iface * @orig_node: the orig node for the router * @if_outgoing: the interface where the payload packet has been received or * the OGM should be sent to @@@ -656,11 -663,6 +656,11 @@@ batadv_neigh_node_new(struct batadv_ori ether_addr_copy(neigh_node->addr, neigh_addr); neigh_node->if_incoming = hard_iface; neigh_node->orig_node = orig_node; + neigh_node->last_seen = jiffies; + + /* increment unique neighbor refcount */ + kref_get(&hardif_neigh->refcount); + neigh_node->hardif_neigh = hardif_neigh; /* extra reference for return */ kref_init(&neigh_node->refcount); @@@ -670,6 -672,9 +670,6 @@@ hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); spin_unlock_bh(&orig_node->neigh_list_lock); - /* increment unique neighbor refcount */ - kref_get(&hardif_neigh->refcount); - batadv_dbg(BATADV_DBG_BATMAN, orig_node->bat_priv, "Creating new neighbor %pM for orig_node %pM on interface %s\n", neigh_addr, orig_node->orig, hard_iface->net_dev->name); @@@ -1217,7 -1222,7 +1217,7 @@@ static void batadv_purge_orig(struct wo struct delayed_work *delayed_work; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); bat_priv = container_of(delayed_work, struct batadv_priv, orig_work); _batadv_purge_orig(bat_priv); queue_delayed_work(batadv_event_workqueue, diff --combined net/batman-adv/send.c index 7641785,20076b4..99ea900 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@@ -552,7 -552,7 +552,7 @@@ static void batadv_send_outstanding_bca struct net_device *soft_iface; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, delayed_work); soft_iface = forw_packet->if_incoming->soft_iface; @@@ -604,7 -604,7 +604,7 @@@ void batadv_send_outstanding_bat_ogm_pa struct batadv_forw_packet *forw_packet; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); forw_packet = container_of(delayed_work, struct batadv_forw_packet, delayed_work); bat_priv = netdev_priv(forw_packet->if_incoming->soft_iface); @@@ -675,9 -675,6 +675,9 @@@ batadv_purge_outstanding_packets(struc if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + batadv_forw_packet_free(forw_packet); } } @@@ -705,9 -702,6 +705,9 @@@ if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + batadv_forw_packet_free(forw_packet); } } diff --combined net/batman-adv/soft-interface.c index dcb16c3,d78c560..dfb4d56 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -208,7 -208,7 +208,7 @@@ static int batadv_interface_tx(struct s if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; - soft_iface->trans_start = jiffies; + netif_trans_update(soft_iface); vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); @@@ -381,6 -381,24 +381,24 @@@ end return NETDEV_TX_OK; } + /** + * batadv_interface_rx - receive ethernet frame on local batman-adv interface + * @soft_iface: local interface which will receive the ethernet frame + * @skb: ethernet frame for @soft_iface + * @recv_if: interface on which the batman-adv packet was received + * @hdr_size: size of already parsed batman-adv header + * @orig_node: originator from which the batman-adv packet was sent + * + * Sends a ethernet frame to the receive path of the local @soft_iface. + * skb->data has still point to the batman-adv header with the size @hdr_size. + * The caller has to have parsed this header already and made sure that at least + * @hdr_size bytes are still available for pull in @skb. + * + * The packet may still get dropped. This can happen when the encapsulated + * ethernet frame is invalid or contains again an batman-adv packet. Also + * unicast packets will be dropped directly when it was sent between two + * isolated clients. + */ void batadv_interface_rx(struct net_device *soft_iface, struct sk_buff *skb, struct batadv_hard_iface *recv_if, int hdr_size, struct batadv_orig_node *orig_node) @@@ -408,17 -426,11 +426,17 @@@ */ nf_reset(skb); + if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) + goto dropped; + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); switch (ntohs(ethhdr->h_proto)) { case ETH_P_8021Q: + if (!pskb_may_pull(skb, VLAN_ETH_HLEN)) + goto dropped; + vhdr = (struct vlan_ethhdr *)skb->data; if (vhdr->h_vlan_encapsulated_proto != ethertype) @@@ -430,6 -442,8 +448,6 @@@ } /* skb->dev & skb->pkt_type are set here */ - if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) - goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); /* should not be necessary anymore as we use skb_pull_rcsum() @@@ -543,7 -557,7 +561,7 @@@ struct batadv_softif_vlan *batadv_softi } /** - * batadv_create_vlan - allocate the needed resources for a new vlan + * batadv_softif_create_vlan - allocate the needed resources for a new vlan * @bat_priv: the bat priv with all the soft interface information * @vid: the VLAN identifier * diff --combined net/batman-adv/translation-table.c index 9b4551a,d44ce84..942b3aa --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -215,8 -215,6 +215,8 @@@ static void batadv_tt_local_entry_relea tt_local_entry = container_of(ref, struct batadv_tt_local_entry, common.refcount); + batadv_softif_vlan_put(tt_local_entry->vlan); + kfree_rcu(tt_local_entry, common.rcu); } @@@ -675,7 -673,6 +675,7 @@@ bool batadv_tt_local_add(struct net_dev kref_get(&tt_local->common.refcount); tt_local->last_seen = jiffies; tt_local->common.added_at = tt_local->last_seen; + tt_local->vlan = vlan; /* the batman interface mac and multicast addresses should never be * purged @@@ -994,6 -991,7 +994,6 @@@ int batadv_tt_local_seq_print_text(stru struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; struct batadv_hard_iface *primary_if; - struct batadv_softif_vlan *vlan; struct hlist_head *head; unsigned short vid; u32 i; @@@ -1010,8 -1008,8 +1010,8 @@@ seq_printf(seq, "Locally retrieved addresses (from %s) announced via TT (TTVN: %u):\n", net_dev->name, (u8)atomic_read(&bat_priv->tt.vn)); - seq_printf(seq, " %-13s %s %-8s %-9s (%-10s)\n", "Client", "VID", - "Flags", "Last seen", "CRC"); + seq_puts(seq, + " Client VID Flags Last seen (CRC )\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -1029,6 -1027,14 +1029,6 @@@ last_seen_msecs = last_seen_msecs % 1000; no_purge = tt_common_entry->flags & np_flag; - - vlan = batadv_softif_vlan_get(bat_priv, vid); - if (!vlan) { - seq_printf(seq, "Cannot retrieve VLAN %d\n", - BATADV_PRINT_VID(vid)); - continue; - } - seq_printf(seq, " * %pM %4i [%c%c%c%c%c%c] %3u.%03u (%#.8x)\n", tt_common_entry->addr, @@@ -1046,7 -1052,9 +1046,7 @@@ BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), no_purge ? 0 : last_seen_secs, no_purge ? 0 : last_seen_msecs, - vlan->tt.crc); - - batadv_softif_vlan_put(vlan); + tt_local->vlan->tt.crc); } rcu_read_unlock(); } @@@ -1091,6 -1099,7 +1091,6 @@@ u16 batadv_tt_local_remove(struct batad { struct batadv_tt_local_entry *tt_local_entry; u16 flags, curr_flags = BATADV_NO_FLAGS; - struct batadv_softif_vlan *vlan; void *tt_entry_exists; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); @@@ -1130,6 -1139,14 +1130,6 @@@ /* extra call to free the local tt entry */ batadv_tt_local_entry_put(tt_local_entry); - /* decrease the reference held for this vlan */ - vlan = batadv_softif_vlan_get(bat_priv, vid); - if (!vlan) - goto out; - - batadv_softif_vlan_put(vlan); - batadv_softif_vlan_put(vlan); - out: if (tt_local_entry) batadv_tt_local_entry_put(tt_local_entry); @@@ -1202,6 -1219,7 +1202,6 @@@ static void batadv_tt_local_table_free( spinlock_t *list_lock; /* protects write access to the hash lists */ struct batadv_tt_common_entry *tt_common_entry; struct batadv_tt_local_entry *tt_local; - struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; u32 i; @@@ -1223,6 -1241,14 +1223,6 @@@ struct batadv_tt_local_entry, common); - /* decrease the reference held for this vlan */ - vlan = batadv_softif_vlan_get(bat_priv, - tt_common_entry->vid); - if (vlan) { - batadv_softif_vlan_put(vlan); - batadv_softif_vlan_put(vlan); - } - batadv_tt_local_entry_put(tt_local); } spin_unlock_bh(list_lock); @@@ -1680,9 -1706,8 +1680,8 @@@ int batadv_tt_global_seq_print_text(str seq_printf(seq, "Globally announced TT entries received via the mesh %s\n", net_dev->name); - seq_printf(seq, " %-13s %s %s %-15s %s (%-10s) %s\n", - "Client", "VID", "(TTVN)", "Originator", "(Curr TTVN)", - "CRC", "Flags"); + seq_puts(seq, + " Client VID (TTVN) Originator (Curr TTVN) (CRC ) Flags\n"); for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@@ -3201,7 -3226,7 +3200,7 @@@ static void batadv_tt_purge(struct work struct batadv_priv_tt *priv_tt; struct batadv_priv *bat_priv; - delayed_work = container_of(work, struct delayed_work, work); + delayed_work = to_delayed_work(work); priv_tt = container_of(delayed_work, struct batadv_priv_tt, work); bat_priv = container_of(priv_tt, struct batadv_priv, tt); @@@ -3283,6 -3308,7 +3282,6 @@@ static void batadv_tt_local_purge_pendi struct batadv_hashtable *hash = bat_priv->tt.local_hash; struct batadv_tt_common_entry *tt_common; struct batadv_tt_local_entry *tt_local; - struct batadv_softif_vlan *vlan; struct hlist_node *node_tmp; struct hlist_head *head; spinlock_t *list_lock; /* protects write access to the hash lists */ @@@ -3312,6 -3338,13 +3311,6 @@@ struct batadv_tt_local_entry, common); - /* decrease the reference held for this vlan */ - vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid); - if (vlan) { - batadv_softif_vlan_put(vlan); - batadv_softif_vlan_put(vlan); - } - batadv_tt_local_entry_put(tt_local); } spin_unlock_bh(list_lock); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20160505
by batman＠open-mesh.org 05 May '16

05 May '16

The following commit has been merged in the master branch: commit efcc9d3069c982786f380bca8480a1aa2fd2721d Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Mon Feb 1 15:21:37 2016 +0100 batman-adv: move and restructure batadv_v_ogm_forward To match our code better to the protocol description of B.A.T.M.A.N. V, move batadv_v_ogm_forward() out into batadv_v_ogm_process_per_outif() and move all checks directly deciding whether the OGM should be forwarded into batadv_v_ogm_forward(). Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Antonio Quartulli <a(a)unstable.cc> diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index d9bcbe6..07c9997 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -347,10 +347,12 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, } /** - * batadv_v_ogm_forward - forward an OGM to the given outgoing interface + * batadv_v_ogm_forward - check conditions and forward an OGM to the given + * outgoing interface * @bat_priv: the bat priv with all the soft interface information * @ogm_received: previously received OGM to be forwarded - * @throughput: throughput to announce, may vary per outgoing interface + * @orig_node: the originator which has been updated + * @neigh_node: the neigh_node through with the OGM has been received * @if_incoming: the interface on which this OGM was received on * @if_outgoing: the interface to which the OGM has to be forwarded to * @@ -359,28 +361,57 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, */ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, const struct batadv_ogm2_packet *ogm_received, - u32 throughput, + struct batadv_orig_node *orig_node, + struct batadv_neigh_node *neigh_node, struct batadv_hard_iface *if_incoming, struct batadv_hard_iface *if_outgoing) { + struct batadv_neigh_ifinfo *neigh_ifinfo = NULL; + struct batadv_orig_ifinfo *orig_ifinfo = NULL; + struct batadv_neigh_node *router = NULL; struct batadv_ogm2_packet *ogm_forward; unsigned char *skb_buff; struct sk_buff *skb; size_t packet_len; u16 tvlv_len; + /* only forward for specific interfaces, not for the default one. */ + if (if_outgoing == BATADV_IF_DEFAULT) + goto out; + + orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); + if (!orig_ifinfo) + goto out; + + /* acquire possibly updated router */ + router = batadv_orig_router_get(orig_node, if_outgoing); + + /* strict rule: forward packets coming from the best next hop only */ + if (neigh_node != router) + goto out; + + /* don't forward the same seqno twice on one interface */ + if (orig_ifinfo->last_seqno_forwarded == ntohl(ogm_received->seqno)) + goto out; + + orig_ifinfo->last_seqno_forwarded = ntohl(ogm_received->seqno); + if (ogm_received->ttl <= 1) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "ttl exceeded\n"); - return; + goto out; } + neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing); + if (!neigh_ifinfo) + goto out; + tvlv_len = ntohs(ogm_received->tvlv_len); packet_len = BATADV_OGM2_HLEN + tvlv_len; skb = netdev_alloc_skb_ip_align(if_outgoing->net_dev, ETH_HLEN + packet_len); if (!skb) - return; + goto out; skb_reserve(skb, ETH_HLEN); skb_buff = skb_put(skb, packet_len); @@ -388,15 +419,23 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, /* apply forward penalty */ ogm_forward = (struct batadv_ogm2_packet *)skb_buff; - ogm_forward->throughput = htonl(throughput); + ogm_forward->throughput = htonl(neigh_ifinfo->bat_v.throughput); ogm_forward->ttl--; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Forwarding OGM2 packet on %s: throughput %u, ttl %u, received via %s\n", - if_outgoing->net_dev->name, throughput, ogm_forward->ttl, - if_incoming->net_dev->name); + if_outgoing->net_dev->name, ntohl(ogm_forward->throughput), + ogm_forward->ttl, if_incoming->net_dev->name); batadv_v_ogm_send_to_if(skb, if_outgoing); + +out: + if (orig_ifinfo) + batadv_orig_ifinfo_put(orig_ifinfo); + if (router) + batadv_neigh_node_put(router); + if (neigh_ifinfo) + batadv_neigh_ifinfo_put(neigh_ifinfo); } /** @@ -493,8 +532,10 @@ out: * @neigh_node: the neigh_node through with the OGM has been received * @if_incoming: the interface where this packet was received * @if_outgoing: the interface for which the packet should be considered + * + * Return: true if the packet should be forwarded, false otherwise */ -static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, +static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv, const struct ethhdr *ethhdr, const struct batadv_ogm2_packet *ogm2, struct batadv_orig_node *orig_node, @@ -503,14 +544,9 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, struct batadv_hard_iface *if_outgoing) { struct batadv_neigh_node *router = NULL; - struct batadv_neigh_ifinfo *neigh_ifinfo = NULL; struct batadv_orig_node *orig_neigh_node = NULL; - struct batadv_orig_ifinfo *orig_ifinfo = NULL; struct batadv_neigh_node *orig_neigh_router = NULL; - - neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing); - if (!neigh_ifinfo) - goto out; + bool forward = false; orig_neigh_node = batadv_v_ogm_orig_get(bat_priv, ethhdr->h_source); if (!orig_neigh_node) @@ -529,47 +565,20 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, goto out; } - if (router) - batadv_neigh_node_put(router); - /* Update routes, and check if the OGM is from the best next hop */ batadv_v_ogm_orig_update(bat_priv, orig_node, neigh_node, ogm2, if_outgoing); - orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); - if (!orig_ifinfo) - goto out; - - /* don't forward the same seqno twice on one interface */ - if (orig_ifinfo->last_seqno_forwarded == ntohl(ogm2->seqno)) - goto out; - - /* acquire possibly updated router */ - router = batadv_orig_router_get(orig_node, if_outgoing); - - /* strict rule: forward packets coming from the best next hop only */ - if (neigh_node != router) - goto out; - - /* only forward for specific interface, not for the default one. */ - if (if_outgoing != BATADV_IF_DEFAULT) { - orig_ifinfo->last_seqno_forwarded = ntohl(ogm2->seqno); - batadv_v_ogm_forward(bat_priv, ogm2, - neigh_ifinfo->bat_v.throughput, - if_incoming, if_outgoing); - } - + forward = true; out: - if (orig_ifinfo) - batadv_orig_ifinfo_put(orig_ifinfo); if (router) batadv_neigh_node_put(router); if (orig_neigh_router) batadv_neigh_node_put(orig_neigh_router); if (orig_neigh_node) batadv_orig_node_put(orig_neigh_node); - if (neigh_ifinfo) - batadv_neigh_ifinfo_put(neigh_ifinfo); + + return forward; } /** @@ -592,6 +601,7 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, struct batadv_hard_iface *if_outgoing) { int seqno_age; + bool forward; /* first, update the metric with according sanity checks */ seqno_age = batadv_v_ogm_metric_update(bat_priv, ogm2, orig_node, @@ -610,8 +620,14 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, ntohs(ogm2->tvlv_len)); /* if the metric update went through, update routes if needed */ - batadv_v_ogm_route_update(bat_priv, ethhdr, ogm2, orig_node, - neigh_node, if_incoming, if_outgoing); + forward = batadv_v_ogm_route_update(bat_priv, ethhdr, ogm2, orig_node, + neigh_node, if_incoming, + if_outgoing); + + /* if the routes have been processed correctly, check and forward */ + if (forward) + batadv_v_ogm_forward(bat_priv, ogm2, orig_node, neigh_node, + if_incoming, if_outgoing); } /** -- LinuxNextTracking

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge