linux-merge October 2012

linux-merge@lists.open-mesh.org

2 participants
16 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20121019
by batman＠open-mesh.org 19 Oct '12

19 Oct '12

The following commit has been merged in the master branch: commit 7dac7b76b8db87fc79857a53a09730fb2148579b Author: Linus Lüssing <linus.luessing(a)web.de> Date: Wed Oct 17 14:53:05 2012 +0200 batman-adv: Fix potential broadcast BLA-duplicate-check race condition Threads in the bottom half of batadv_bla_check_bcast_duplist() might otherwise for instance overwrite variables which other threads might be using/reading at the same time in the top half, potentially leading to messing up the bcast_duplist, possibly resulting in false bridge loop avoidance duplicate check decisions. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index eebab20..fd8d5af 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1167,6 +1167,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) uint16_t crc; unsigned long entrytime; + spin_lock_init(&bat_priv->bla.bcast_duplist_lock); + batadv_dbg(BATADV_DBG_BLA, bat_priv, "bla hash registering\n"); /* setting claim destination address */ @@ -1226,7 +1228,7 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, int bcast_packet_len) { - int i, length, curr; + int i, length, curr, ret = 0; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; @@ -1238,6 +1240,8 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, /* calculate the crc ... */ crc = crc16(0, content, length); + spin_lock_bh(&bat_priv->bla.bcast_duplist_lock); + for (i = 0; i < BATADV_DUPLIST_SIZE; i++) { curr = (bat_priv->bla.bcast_duplist_curr + i); curr %= BATADV_DUPLIST_SIZE; @@ -1259,9 +1263,12 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, /* this entry seems to match: same crc, not too old, * and from another gw. therefore return 1 to forbid it. */ - return 1; + ret = 1; + goto out; } - /* not found, add a new entry (overwrite the oldest entry) */ + /* not found, add a new entry (overwrite the oldest entry) + * and allow it, its the first occurence. + */ curr = (bat_priv->bla.bcast_duplist_curr + BATADV_DUPLIST_SIZE - 1); curr %= BATADV_DUPLIST_SIZE; entry = &bat_priv->bla.bcast_duplist[curr]; @@ -1270,8 +1277,10 @@ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, memcpy(entry->orig, bcast_packet->orig, ETH_ALEN); bat_priv->bla.bcast_duplist_curr = curr; - /* allow it, its the first occurence. */ - return 0; +out: + spin_unlock_bh(&bat_priv->bla.bcast_duplist_lock); + + return ret; } diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 2ed82ca..ac1e07a 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -205,6 +205,8 @@ struct batadv_priv_bla { struct batadv_hashtable *backbone_hash; struct batadv_bcast_duplist_entry bcast_duplist[BATADV_DUPLIST_SIZE]; int bcast_duplist_curr; + /* protects bcast_duplist and bcast_duplist_curr */ + spinlock_t bcast_duplist_lock; struct batadv_bla_claim_dst claim_dest; struct delayed_work work; }; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20121019
by batman＠open-mesh.org 19 Oct '12

19 Oct '12

The following commit has been merged in the master branch: commit 7f112af40fecf5399b61e69ffc6b55a9d82789f7 Author: Linus Lüssing <linus.luessing(a)web.de> Date: Wed Oct 17 14:53:04 2012 +0200 batman-adv: Fix broadcast packet CRC calculation So far the crc16 checksum for a batman-adv broadcast data packet, received on a batman-adv hard interface, was calculated over zero bytes of its content leading to many incoming broadcast data packets wrongly being dropped (60-80% packet loss). This patch fixes this issue by calculating the crc16 over the actual, complete broadcast payload. The issue is a regression introduced by ("batman-adv: add broadcast duplicate check"). Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0a9084a..eebab20 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -1210,8 +1210,8 @@ int batadv_bla_init(struct batadv_priv *bat_priv) /** * batadv_bla_check_bcast_duplist * @bat_priv: the bat priv with all the soft interface information - * @bcast_packet: originator mac address - * @hdr_size: maximum length of the frame + * @bcast_packet: encapsulated broadcast frame plus batman header + * @bcast_packet_len: length of encapsulated broadcast frame plus batman header * * check if it is on our broadcast list. Another gateway might * have sent the same packet because it is connected to the same backbone, @@ -1224,14 +1224,14 @@ int batadv_bla_init(struct batadv_priv *bat_priv) */ int batadv_bla_check_bcast_duplist(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet, - int hdr_size) + int bcast_packet_len) { int i, length, curr; uint8_t *content; uint16_t crc; struct batadv_bcast_duplist_entry *entry; - length = hdr_size - sizeof(*bcast_packet); + length = bcast_packet_len - sizeof(*bcast_packet); content = (uint8_t *)bcast_packet; content += sizeof(*bcast_packet); diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 939fc01..376b4cc 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1124,8 +1124,14 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, spin_unlock_bh(&orig_node->bcast_seqno_lock); + /* keep skb linear for crc calculation */ + if (skb_linearize(skb) < 0) + goto out; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + /* check whether this has been sent by another originator before */ - if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, hdr_size)) + if (batadv_bla_check_bcast_duplist(bat_priv, bcast_packet, skb->len)) goto out; /* rebroadcast packet */ -- LinuxNextTracking

1 0

Build check errors found: 2012-10-18
by postmaster＠open-mesh.org 18 Oct '12

18 Oct '12

Name of failed tests ==================== Multiline comment ending at a non-empty line master Multiline comment ending at a non-empty line next sparse master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n sparse next linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y sparse next linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y Output of different failed tests ================================ Multiline comment ending at a non-empty line master: >>>>>>>> bridge_loop_avoidance.c:1305: * and allow it, its the first occurence. */ Multiline comment ending at a non-empty line next: >>>>>>>> bridge_loop_avoidance.c:1268: * and allow it, its the first occurence. */ sparse master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> /home/batman/build_test/tmp/main.c:107:9: error: no member 'bla' in struct batadv_priv /home/batman/build_test/tmp/main.c: In function 'batadv_mesh_init': /home/batman/build_test/tmp/main.c:107:2: error: 'struct batadv_priv' has no member named 'bla' make[2]: *** [/home/batman/build_test/tmp/main.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2 sparse master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> /home/batman/build_test/tmp/main.c:107:9: error: no member 'bla' in struct batadv_priv /home/batman/build_test/tmp/main.c:107:9: error: no member 'bla' in struct batadv_priv /home/batman/build_test/tmp/main.c: In function 'batadv_mesh_init': /home/batman/build_test/tmp/main.c:107:2: error: 'struct batadv_priv' has no member named 'bla' /home/batman/build_test/tmp/main.c:107:2: error: 'struct batadv_priv' has no member named 'bla' make[2]: *** [/home/batman/build_test/tmp/main.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2 sparse next linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> /home/batman/build_test/tmp/main.c:104:9: error: no member 'bla' in struct batadv_priv /home/batman/build_test/tmp/main.c: In function 'batadv_mesh_init': /home/batman/build_test/tmp/main.c:104:2: error: 'struct batadv_priv' has no member named 'bla' make[2]: *** [/home/batman/build_test/tmp/main.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2 sparse next linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> /home/batman/build_test/tmp/main.c:104:9: error: no member 'bla' in struct batadv_priv /home/batman/build_test/tmp/main.c:104:9: error: no member 'bla' in struct batadv_priv /home/batman/build_test/tmp/main.c: In function 'batadv_mesh_init': /home/batman/build_test/tmp/main.c:104:2: error: 'struct batadv_priv' has no member named 'bla' /home/batman/build_test/tmp/main.c:104:2: error: 'struct batadv_priv' has no member named 'bla' make[2]: *** [/home/batman/build_test/tmp/main.o] Error 1 make[1]: *** [_module_/home/batman/build_test/tmp] Error 2 make: *** [all] Error 2 unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> 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_switch batadv_debugfs_add_meshif batadv_debugfs_del_meshif batadv_debugfs_destroy batadv_debugfs_init batadv_free_rcu_neigh_node batadv_free_rcu_tt_local_entry batadv_gw_bandwidth_set batadv_gw_election batadv_gw_get_selected_orig batadv_gw_is_dhcp_target batadv_gw_node_delete batadv_gw_node_purge batadv_gw_out_of_range batadv_hard_if_notifier batadv_hardif_disable_interface batadv_hardif_enable_interface batadv_hardif_get_by_netdev batadv_hardif_min_mtu batadv_hardif_remove_interfaces batadv_is_wifi_iface batadv_iv_init batadv_socket_init batadv_socket_receive_packet batadv_update_min_mtu unused_symbols master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> 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_switch batadv_debugfs_add_meshif batadv_debugfs_del_meshif batadv_debugfs_destroy batadv_debugfs_init batadv_gw_bandwidth_set batadv_gw_election batadv_gw_get_selected_orig batadv_gw_is_dhcp_target batadv_gw_node_delete batadv_gw_node_purge batadv_gw_out_of_range batadv_hard_if_notifier batadv_hardif_disable_interface batadv_hardif_enable_interface batadv_hardif_get_by_netdev batadv_hardif_min_mtu batadv_hardif_remove_interfaces batadv_is_wifi_iface batadv_iv_init batadv_socket_init batadv_socket_receive_packet batadv_update_min_mtu unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> batadv_debugfs_add_meshif batadv_debugfs_del_meshif batadv_debugfs_destroy batadv_debugfs_init batadv_free_rcu_neigh_node batadv_free_rcu_tt_local_entry batadv_gw_bandwidth_set batadv_gw_election batadv_gw_get_selected_orig batadv_gw_is_dhcp_target batadv_gw_node_delete batadv_gw_node_purge batadv_gw_out_of_range batadv_hard_if_notifier batadv_hardif_disable_interface batadv_hardif_enable_interface batadv_hardif_get_by_netdev batadv_hardif_min_mtu batadv_hardif_remove_interfaces batadv_hash_destroy batadv_hash_new batadv_is_wifi_iface batadv_iv_init batadv_socket_init batadv_socket_receive_packet batadv_update_min_mtu unused_symbols next linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> batadv_debugfs_add_meshif batadv_debugfs_del_meshif batadv_debugfs_destroy batadv_debugfs_init batadv_gw_bandwidth_set batadv_gw_election batadv_gw_get_selected_orig batadv_gw_is_dhcp_target batadv_gw_node_delete batadv_gw_node_purge batadv_gw_out_of_range batadv_hard_if_notifier batadv_hardif_disable_interface batadv_hardif_enable_interface batadv_hardif_get_by_netdev batadv_hardif_min_mtu batadv_hardif_remove_interfaces batadv_hash_destroy batadv_hash_new batadv_is_wifi_iface batadv_iv_init batadv_socket_init batadv_socket_receive_packet batadv_update_min_mtu

1 0

Build check errors found: 2012-10-14
by postmaster＠open-mesh.org 13 Oct '12

13 Oct '12

Name of failed tests ==================== bracket_align master distributed-arp-table.h checkpatch master distributed-arp-table.h Output of different failed tests ================================ bracket_align master distributed-arp-table.h: >>>>>>>> Found wrong alignment at distributed-arp-table.h:63, was 30 but expected 26 checkpatch master distributed-arp-table.h: >>>>>>>> CHECK: Alignment should match open parenthesis #63: FILE: distributed-arp-table.h:63: +batadv_dat_init_own_addr(struct batadv_priv *bat_priv, + struct batadv_hard_iface *primary_if) total: 0 errors, 0 warnings, 1 checks, 168 lines checked

1 0

Build check errors found: 2012-10-13
by postmaster＠open-mesh.org 12 Oct '12

12 Oct '12

1 0

Build check errors found: 2012-10-12
by postmaster＠open-mesh.org 11 Oct '12

11 Oct '12

1 0

Build check errors found: 2012-10-11
by postmaster＠open-mesh.org 10 Oct '12

10 Oct '12

1 0

Build check errors found: 2012-10-10
by postmaster＠open-mesh.org 09 Oct '12

09 Oct '12

1 0

Noticed difference in packet.h in master.diff
by postmaster＠open-mesh.org 09 Oct '12

09 Oct '12

--- batman-adv_master.packet.h 2012-10-10 00:15:01.143410189 +0200 +++ batctl_master.packet.h 2012-10-10 00:15:01.151410709 +0200 @@ -23,29 +23,14 @@ #define BATADV_ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum batadv_packettype { - BATADV_IV_OGM = 0x01, - BATADV_ICMP = 0x02, - BATADV_UNICAST = 0x03, - BATADV_BCAST = 0x04, - BATADV_VIS = 0x05, - BATADV_UNICAST_FRAG = 0x06, - BATADV_TT_QUERY = 0x07, - BATADV_ROAM_ADV = 0x08, - BATADV_UNICAST_4ADDR = 0x09, -}; - -/** - * enum batadv_subtype - packet subtype for unicast4addr - * @BATADV_P_DATA: user payload - * @BATADV_P_DAT_DHT_GET: DHT request message - * @BATADV_P_DAT_DHT_PUT: DHT store message - * @BATADV_P_DAT_CACHE_REPLY: ARP reply generated by DAT - */ -enum batadv_subtype { - BATADV_P_DATA = 0x01, - BATADV_P_DAT_DHT_GET = 0x02, - BATADV_P_DAT_DHT_PUT = 0x03, - BATADV_P_DAT_CACHE_REPLY = 0x04, + BATADV_IV_OGM = 0x01, + BATADV_ICMP = 0x02, + BATADV_UNICAST = 0x03, + BATADV_BCAST = 0x04, + BATADV_VIS = 0x05, + BATADV_UNICAST_FRAG = 0x06, + BATADV_TT_QUERY = 0x07, + BATADV_ROAM_ADV = 0x08, }; /* this file is included by batctl which needs these defines */ @@ -176,18 +161,6 @@ uint8_t dest[ETH_ALEN]; } __packed; -/** - * struct batadv_unicast_4addr_packet - extended unicast packet - * @u: common unicast packet header - * @src: address of the source - * @subtype: packet subtype - */ -struct batadv_unicast_4addr_packet { - struct batadv_unicast_packet u; - uint8_t src[ETH_ALEN]; - uint8_t subtype; -} __packed; - struct batadv_unicast_frag_packet { struct batadv_header header; uint8_t ttvn; /* destination translation table version number */

1 0

Build check errors found: 2012-10-09
by postmaster＠open-mesh.org 08 Oct '12

08 Oct '12

Name of failed tests ==================== bracket_align master distributed-arp-table.h checkpatch master distributed-arp-table.h unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.4 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.4 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.5 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.5 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.6 CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.6 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n Output of different failed tests ================================ bracket_align master distributed-arp-table.h: >>>>>>>> Found wrong alignment at distributed-arp-table.h:63, was 30 but expected 26 checkpatch master distributed-arp-table.h: >>>>>>>> CHECK: Alignment should match open parenthesis #63: FILE: distributed-arp-table.h:63: +batadv_dat_init_own_addr(struct batadv_priv *bat_priv, + struct batadv_hard_iface *primary_if) total: 0 errors, 0 warnings, 1 checks, 168 lines checked unused_symbols master linux-3.6 CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> batadv_unicast_4addr_prepare_skb

1 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge October 2012