linux-merge May 2012

linux-merge@lists.open-mesh.org

2 participants
57 discussions

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 0b0094e000840115b5baece2293c5fb1aab4fded Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 1 15:35:20 2012 +0800 batman-adv: replace HZ calculations with jiffies_to_msecs() Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c index 916380c..3b588f8 100644 --- a/net/batman-adv/bat_debugfs.c +++ b/net/batman-adv/bat_debugfs.c @@ -83,8 +83,8 @@ int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); - fdebug_log(bat_priv->debug_log, "[%10lu] %s", - (jiffies / HZ), tmp_log_buf); + fdebug_log(bat_priv->debug_log, "[%10u] %s", + jiffies_to_msecs(jiffies), tmp_log_buf); va_end(args); return 0; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 21c1f83..962636b 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -35,7 +35,8 @@ static void purge_orig(struct work_struct *work); static void start_purge_timer(struct bat_priv *bat_priv) { INIT_DELAYED_WORK(&bat_priv->orig_work, purge_orig); - queue_delayed_work(bat_event_workqueue, &bat_priv->orig_work, 1 * HZ); + queue_delayed_work(bat_event_workqueue, + &bat_priv->orig_work, msecs_to_jiffies(1000)); } /* returns 1 if they are the same originator */ @@ -274,6 +275,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, struct hlist_node *node, *node_tmp; struct neigh_node *neigh_node; bool neigh_purged = false; + unsigned long last_seen; *best_neigh_node = NULL; @@ -288,6 +290,8 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) || (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) { + last_seen = neigh_node->last_seen; + if ((neigh_node->if_incoming->if_status == IF_INACTIVE) || (neigh_node->if_incoming->if_status == @@ -300,9 +304,9 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, neigh_node->if_incoming->net_dev->name); else bat_dbg(DBG_BATMAN, bat_priv, - "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %lu\n", + "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %u\n", orig_node->orig, neigh_node->addr, - (neigh_node->last_seen / HZ)); + jiffies_to_msecs(last_seen)); neigh_purged = true; @@ -327,8 +331,9 @@ static bool purge_orig_node(struct bat_priv *bat_priv, if (has_timed_out(orig_node->last_seen, 2 * PURGE_TIMEOUT)) { bat_dbg(DBG_BATMAN, bat_priv, - "Originator timeout: originator %pM, last_seen %lu\n", - orig_node->orig, (orig_node->last_seen / HZ)); + "Originator timeout: originator %pM, last_seen %u\n", + orig_node->orig, + jiffies_to_msecs(orig_node->last_seen)); return true; } else { if (purge_orig_neighbors(bat_priv, orig_node, diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 7c66b61..8e74d97 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -292,7 +292,7 @@ static void send_outstanding_bcast_packet(struct work_struct *work) /* if we still have some more bcasts to send */ if (forw_packet->num_packets < 3) { _add_bcast_packet_to_list(bat_priv, forw_packet, - ((5 * HZ) / 1000)); + msecs_to_jiffies(5)); return; } -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 7ae8b2852f946c71fdbd910156baa605a4ae3cee Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 1 15:35:21 2012 +0800 batman-adv: split neigh_new function into generic and batman iv specific parts Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 8652a75..ae0a08c 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -30,6 +30,32 @@ #include "send.h" #include "bat_algo.h" +static struct neigh_node *bat_iv_ogm_neigh_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + struct orig_node *orig_node, + struct orig_node *orig_neigh, + uint32_t seqno) +{ + struct neigh_node *neigh_node; + + neigh_node = batadv_neigh_node_new(hard_iface, neigh_addr, seqno); + if (!neigh_node) + goto out; + + INIT_LIST_HEAD(&neigh_node->bonding_list); + spin_lock_init(&neigh_node->tq_lock); + + neigh_node->orig_node = orig_neigh; + neigh_node->if_incoming = hard_iface; + + spin_lock_bh(&orig_node->neigh_list_lock); + hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); + spin_unlock_bh(&orig_node->neigh_list_lock); + +out: + return neigh_node; +} + static int bat_iv_ogm_iface_enable(struct hard_iface *hard_iface) { struct batman_ogm_packet *batman_ogm_packet; @@ -638,8 +664,9 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, if (!orig_tmp) goto unlock; - neigh_node = create_neighbor(orig_node, orig_tmp, - ethhdr->h_source, if_incoming); + neigh_node = bat_iv_ogm_neigh_new(if_incoming, ethhdr->h_source, + orig_node, orig_tmp, + batman_ogm_packet->seqno); orig_node_free_ref(orig_tmp); if (!neigh_node) @@ -764,10 +791,11 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node, rcu_read_unlock(); if (!neigh_node) - neigh_node = create_neighbor(orig_neigh_node, - orig_neigh_node, - orig_neigh_node->orig, - if_incoming); + neigh_node = bat_iv_ogm_neigh_new(if_incoming, + orig_neigh_node->orig, + orig_neigh_node, + orig_neigh_node, + batman_ogm_packet->seqno); if (!neigh_node) goto out; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 962636b..f4b6201 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -85,35 +85,29 @@ struct neigh_node *orig_node_get_router(struct orig_node *orig_node) return router; } -struct neigh_node *create_neighbor(struct orig_node *orig_node, - struct orig_node *orig_neigh_node, - const uint8_t *neigh, - struct hard_iface *if_incoming) +struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno) { - struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); + struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct neigh_node *neigh_node; - bat_dbg(DBG_BATMAN, bat_priv, - "Creating new last-hop neighbor of originator\n"); - neigh_node = kzalloc(sizeof(*neigh_node), GFP_ATOMIC); if (!neigh_node) - return NULL; + goto out; INIT_HLIST_NODE(&neigh_node->list); - INIT_LIST_HEAD(&neigh_node->bonding_list); - spin_lock_init(&neigh_node->tq_lock); - memcpy(neigh_node->addr, neigh, ETH_ALEN); - neigh_node->orig_node = orig_neigh_node; - neigh_node->if_incoming = if_incoming; + memcpy(neigh_node->addr, neigh_addr, ETH_ALEN); /* extra reference for return */ atomic_set(&neigh_node->refcount, 2); - spin_lock_bh(&orig_node->neigh_list_lock); - hlist_add_head_rcu(&neigh_node->list, &orig_node->neigh_list); - spin_unlock_bh(&orig_node->neigh_list_lock); + bat_dbg(DBG_BATMAN, bat_priv, + "Creating new neighbor %pM, initial seqno %d\n", + neigh_addr, seqno); + +out: return neigh_node; } diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index 3fe2eda..f74d0d6 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -29,10 +29,9 @@ void originator_free(struct bat_priv *bat_priv); void purge_orig_ref(struct bat_priv *bat_priv); void orig_node_free_ref(struct orig_node *orig_node); struct orig_node *get_orig_node(struct bat_priv *bat_priv, const uint8_t *addr); -struct neigh_node *create_neighbor(struct orig_node *orig_node, - struct orig_node *orig_neigh_node, - const uint8_t *neigh, - struct hard_iface *if_incoming); +struct neigh_node *batadv_neigh_node_new(struct hard_iface *hard_iface, + const uint8_t *neigh_addr, + uint32_t seqno); void neigh_node_free_ref(struct neigh_node *neigh_node); struct neigh_node *orig_node_get_router(struct orig_node *orig_node); int orig_seq_print_text(struct seq_file *seq, void *offset); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit c3e29312c8c27d403f91522711ce9a290c7571c9 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Mar 4 16:56:25 2012 +0800 batman-adv: register batman ogm receive function during protocol init The B.A.T.M.A.N. IV OGM receive function still was hard-coded although it is a routing protocol specific function. This patch takes advantage of the dynamic packet handler registration to remove the hard-coded function calls. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index cd8f473..e0aaf8c 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1155,13 +1155,18 @@ out: orig_node_free_ref(orig_node); } -static void bat_iv_ogm_receive(struct hard_iface *if_incoming, - struct sk_buff *skb) +static int bat_iv_ogm_receive(struct sk_buff *skb, + struct hard_iface *if_incoming) { struct batman_ogm_packet *batman_ogm_packet; struct ethhdr *ethhdr; int buff_pos = 0, packet_len; unsigned char *tt_buff, *packet_buff; + bool ret; + + ret = check_management_packet(skb, if_incoming, BATMAN_OGM_HLEN); + if (!ret) + return NET_RX_DROP; packet_len = skb_headlen(skb); ethhdr = (struct ethhdr *)skb_mac_header(skb); @@ -1187,6 +1192,9 @@ static void bat_iv_ogm_receive(struct hard_iface *if_incoming, (packet_buff + buff_pos); } while (bat_iv_ogm_aggr_packet(buff_pos, packet_len, batman_ogm_packet->tt_num_changes)); + + kfree_skb(skb); + return NET_RX_SUCCESS; } static struct bat_algo_ops batman_iv __read_mostly = { @@ -1197,10 +1205,25 @@ static struct bat_algo_ops batman_iv __read_mostly = { .bat_ogm_update_mac = bat_iv_ogm_update_mac, .bat_ogm_schedule = bat_iv_ogm_schedule, .bat_ogm_emit = bat_iv_ogm_emit, - .bat_ogm_receive = bat_iv_ogm_receive, }; int __init bat_iv_init(void) { - return bat_algo_register(&batman_iv); + int ret; + + /* batman originator packet */ + ret = recv_handler_register(BAT_IV_OGM, bat_iv_ogm_receive); + if (ret < 0) + goto out; + + ret = bat_algo_register(&batman_iv); + if (ret < 0) + goto handler_unregister; + + goto out; + +handler_unregister: + recv_handler_unregister(BAT_IV_OGM); +out: + return ret; } diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index d19b935..f80c447 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -266,8 +266,6 @@ static void recv_handler_init(void) for (i = 0; i < ARRAY_SIZE(recv_packet_handler); i++) recv_packet_handler[i] = recv_unhandled_packet; - /* batman originator packet */ - recv_packet_handler[BAT_IV_OGM] = recv_bat_ogm_packet; /* batman icmp packet */ recv_packet_handler[BAT_ICMP] = recv_icmp_packet; /* unicast packet */ @@ -334,8 +332,7 @@ int bat_algo_register(struct bat_algo_ops *bat_algo_ops) !bat_algo_ops->bat_primary_iface_set || !bat_algo_ops->bat_ogm_update_mac || !bat_algo_ops->bat_ogm_schedule || - !bat_algo_ops->bat_ogm_emit || - !bat_algo_ops->bat_ogm_receive) { + !bat_algo_ops->bat_ogm_emit) { pr_info("Routing algo '%s' does not implement required ops\n", bat_algo_ops->name); goto out; diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index ff56086..7ed9d8f 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -248,37 +248,35 @@ int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, return 0; } -int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *hard_iface) +bool check_management_packet(struct sk_buff *skb, + struct hard_iface *hard_iface, + int header_len) { - struct bat_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct ethhdr *ethhdr; /* drop packet if it has not necessary minimum size */ - if (unlikely(!pskb_may_pull(skb, BATMAN_OGM_HLEN))) - return NET_RX_DROP; + if (unlikely(!pskb_may_pull(skb, header_len))) + return false; ethhdr = (struct ethhdr *)skb_mac_header(skb); /* packet with broadcast indication but unicast recipient */ if (!is_broadcast_ether_addr(ethhdr->h_dest)) - return NET_RX_DROP; + return false; /* packet with broadcast sender address */ if (is_broadcast_ether_addr(ethhdr->h_source)) - return NET_RX_DROP; + return false; /* create a copy of the skb, if needed, to modify it. */ if (skb_cow(skb, 0) < 0) - return NET_RX_DROP; + return false; /* keep skb linear */ if (skb_linearize(skb) < 0) - return NET_RX_DROP; - - bat_priv->bat_algo_ops->bat_ogm_receive(hard_iface, skb); + return false; - kfree_skb(skb); - return NET_RX_SUCCESS; + return true; } static int recv_my_icmp_packet(struct bat_priv *bat_priv, diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index 3d729cb..d6bbbeb 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h @@ -23,6 +23,9 @@ #define _NET_BATMAN_ADV_ROUTING_H_ void slide_own_bcast_window(struct hard_iface *hard_iface); +bool check_management_packet(struct sk_buff *skb, + struct hard_iface *hard_iface, + int header_len); void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node *neigh_node); int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); @@ -30,7 +33,6 @@ int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if); -int recv_bat_ogm_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if); int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if); struct neigh_node *find_router(struct bat_priv *bat_priv, diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 2f4848b..50e1895 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -390,9 +390,6 @@ struct bat_algo_ops { int tt_num_changes); /* send scheduled OGM */ void (*bat_ogm_emit)(struct forw_packet *forw_packet); - /* receive incoming OGM */ - void (*bat_ogm_receive)(struct hard_iface *if_incoming, - struct sk_buff *skb); }; #endif /* _NET_BATMAN_ADV_TYPES_H_ */ -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit d7b2a97e03ad40c7986d3c2707b0b5ba79a63884 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 1 15:35:19 2012 +0800 batman-adv: rename last_valid to last_seen Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index e0aaf8c..8652a75 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -651,7 +651,7 @@ static void bat_iv_ogm_orig_update(struct bat_priv *bat_priv, rcu_read_unlock(); orig_node->flags = batman_ogm_packet->flags; - neigh_node->last_valid = jiffies; + neigh_node->last_seen = jiffies; spin_lock_bh(&neigh_node->tq_lock); ring_buffer_set(neigh_node->tq_recv, @@ -772,11 +772,11 @@ static int bat_iv_ogm_calc_tq(struct orig_node *orig_node, if (!neigh_node) goto out; - /* if orig_node is direct neighbor update neigh_node last_valid */ + /* if orig_node is direct neighbor update neigh_node last_seen */ if (orig_node == orig_neigh_node) - neigh_node->last_valid = jiffies; + neigh_node->last_seen = jiffies; - orig_node->last_valid = jiffies; + orig_node->last_seen = jiffies; /* find packet count of corresponding one hop neighbor */ spin_lock_bh(&orig_node->ogm_cnt_lock); diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index ce49698..21c1f83 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -283,7 +283,7 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, hlist_for_each_entry_safe(neigh_node, node, node_tmp, &orig_node->neigh_list, list) { - if ((has_timed_out(neigh_node->last_valid, PURGE_TIMEOUT)) || + if ((has_timed_out(neigh_node->last_seen, PURGE_TIMEOUT)) || (neigh_node->if_incoming->if_status == IF_INACTIVE) || (neigh_node->if_incoming->if_status == IF_NOT_IN_USE) || (neigh_node->if_incoming->if_status == IF_TO_BE_REMOVED)) { @@ -300,9 +300,9 @@ static bool purge_orig_neighbors(struct bat_priv *bat_priv, neigh_node->if_incoming->net_dev->name); else bat_dbg(DBG_BATMAN, bat_priv, - "neighbor timeout: originator %pM, neighbor: %pM, last_valid: %lu\n", + "neighbor timeout: originator %pM, neighbor: %pM, last_seen: %lu\n", orig_node->orig, neigh_node->addr, - (neigh_node->last_valid / HZ)); + (neigh_node->last_seen / HZ)); neigh_purged = true; @@ -325,10 +325,10 @@ static bool purge_orig_node(struct bat_priv *bat_priv, { struct neigh_node *best_neigh_node; - if (has_timed_out(orig_node->last_valid, 2 * PURGE_TIMEOUT)) { + if (has_timed_out(orig_node->last_seen, 2 * PURGE_TIMEOUT)) { bat_dbg(DBG_BATMAN, bat_priv, - "Originator timeout: originator %pM, last_valid %lu\n", - orig_node->orig, (orig_node->last_valid / HZ)); + "Originator timeout: originator %pM, last_seen %lu\n", + orig_node->orig, (orig_node->last_seen / HZ)); return true; } else { if (purge_orig_neighbors(bat_priv, orig_node, @@ -446,9 +446,9 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) goto next; last_seen_secs = jiffies_to_msecs(jiffies - - orig_node->last_valid) / 1000; + orig_node->last_seen) / 1000; last_seen_msecs = jiffies_to_msecs(jiffies - - orig_node->last_valid) % 1000; + orig_node->last_seen) % 1000; seq_printf(seq, "%pM %4i.%03is (%3i) %pM [%10s]:", orig_node->orig, last_seen_secs, diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 50e1895..9fa8b73 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -52,7 +52,7 @@ struct hard_iface { /** * orig_node - structure for orig_list maintaining nodes of mesh * @primary_addr: hosts primary interface address - * @last_valid: when last packet from this node was received + * @last_seen: when last packet from this node was received * @bcast_seqno_reset: time when the broadcast seqno window was reset * @batman_seqno_reset: time when the batman seqno window was reset * @gw_flags: flags related to gateway class @@ -70,7 +70,7 @@ struct orig_node { struct neigh_node __rcu *router; /* rcu protected pointer */ unsigned long *bcast_own; uint8_t *bcast_own_sum; - unsigned long last_valid; + unsigned long last_seen; unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; uint8_t gw_flags; @@ -120,7 +120,7 @@ struct gw_node { /** * neigh_node - * @last_valid: when last packet via this neighbor was received + * @last_seen: when last packet via this neighbor was received */ struct neigh_node { struct hlist_node list; @@ -131,7 +131,7 @@ struct neigh_node { uint8_t tq_avg; uint8_t last_ttl; struct list_head bonding_list; - unsigned long last_valid; + unsigned long last_seen; DECLARE_BITMAP(real_bits, TQ_LOCAL_WINDOW_SIZE); atomic_t refcount; struct rcu_head rcu; -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 75cd33f86396c446f84c4bb620be70c36a2a54f6 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 1 15:35:16 2012 +0800 batman-adv: introduce is_single_hop_neigh variable to increase readability Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 8b2db2e..cd8f473 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -480,7 +480,8 @@ static void bat_iv_ogm_queue_add(struct bat_priv *bat_priv, static void bat_iv_ogm_forward(struct orig_node *orig_node, const struct ethhdr *ethhdr, struct batman_ogm_packet *batman_ogm_packet, - int directlink, struct hard_iface *if_incoming) + bool is_single_hop_neigh, + struct hard_iface *if_incoming) { struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct neigh_node *router; @@ -533,7 +534,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, /* switch of primaries first hop flag when forwarding */ batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP; - if (directlink) + if (is_single_hop_neigh) batman_ogm_packet->flags |= DIRECTLINK; else batman_ogm_packet->flags &= ~DIRECTLINK; @@ -918,7 +919,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, struct neigh_node *orig_neigh_router = NULL; int has_directlink_flag; int is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; - int is_broadcast = 0, is_bidirectional, is_single_hop_neigh; + int is_broadcast = 0, is_bidirectional; + bool is_single_hop_neigh = false; int is_duplicate; uint32_t if_incoming_seqno; @@ -942,8 +944,8 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0); - is_single_hop_neigh = (compare_eth(ethhdr->h_source, - batman_ogm_packet->orig) ? 1 : 0); + if (compare_eth(ethhdr->h_source, batman_ogm_packet->orig)) + is_single_hop_neigh = true; bat_dbg(DBG_BATMAN, bat_priv, "Received BATMAN packet via NB: %pM, IF: %s [%pM] (from OG: %pM, via prev OG: %pM, seqno %u, ttvn %u, crc %u, changes %u, td %d, TTL %d, V %d, IDF %d)\n", @@ -1114,7 +1116,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, /* mark direct link on incoming interface */ bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet, - 1, if_incoming); + is_single_hop_neigh, if_incoming); bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: rebroadcast neighbor packet with direct link flag\n"); @@ -1137,7 +1139,7 @@ static void bat_iv_ogm_process(const struct ethhdr *ethhdr, bat_dbg(DBG_BATMAN, bat_priv, "Forwarding packet: rebroadcast originator packet\n"); bat_iv_ogm_forward(orig_node, ethhdr, batman_ogm_packet, - 0, if_incoming); + is_single_hop_neigh, if_incoming); out_neigh: if ((orig_neigh_node) && (!is_single_hop_neigh)) -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit ffa995e036bef734ea40cbbccda574d1df3a8a58 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Mar 1 15:35:17 2012 +0800 batman-adv: introduce packet type handler array for incoming packets The packet handler array replaces the growing switch statement, thus dealing with incoming packets in a more efficient way. It also adds to possibility to register packet handlers on the fly. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Acked-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index 47c79d7..95f869c 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -32,12 +32,6 @@ #include <linux/if_arp.h> - -static int batman_skb_recv(struct sk_buff *skb, - struct net_device *dev, - struct packet_type *ptype, - struct net_device *orig_dev); - void hardif_free_rcu(struct rcu_head *rcu) { struct hard_iface *hard_iface; @@ -551,113 +545,6 @@ out: return NOTIFY_DONE; } -/* incoming packets with the batman ethertype received on any active hard - * interface */ -static int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *ptype, - struct net_device *orig_dev) -{ - struct bat_priv *bat_priv; - struct batman_ogm_packet *batman_ogm_packet; - struct hard_iface *hard_iface; - int ret; - - hard_iface = container_of(ptype, struct hard_iface, batman_adv_ptype); - skb = skb_share_check(skb, GFP_ATOMIC); - - /* skb was released by skb_share_check() */ - if (!skb) - goto err_out; - - /* packet should hold at least type and version */ - if (unlikely(!pskb_may_pull(skb, 2))) - goto err_free; - - /* expect a valid ethernet header here. */ - if (unlikely(skb->mac_len != ETH_HLEN || !skb_mac_header(skb))) - goto err_free; - - if (!hard_iface->soft_iface) - goto err_free; - - bat_priv = netdev_priv(hard_iface->soft_iface); - - if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) - goto err_free; - - /* discard frames on not active interfaces */ - if (hard_iface->if_status != IF_ACTIVE) - goto err_free; - - batman_ogm_packet = (struct batman_ogm_packet *)skb->data; - - if (batman_ogm_packet->header.version != COMPAT_VERSION) { - bat_dbg(DBG_BATMAN, bat_priv, - "Drop packet: incompatible batman version (%i)\n", - batman_ogm_packet->header.version); - goto err_free; - } - - /* all receive handlers return whether they received or reused - * the supplied skb. if not, we have to free the skb. */ - - switch (batman_ogm_packet->header.packet_type) { - /* batman originator packet */ - case BAT_IV_OGM: - ret = recv_bat_ogm_packet(skb, hard_iface); - break; - - /* batman icmp packet */ - case BAT_ICMP: - ret = recv_icmp_packet(skb, hard_iface); - break; - - /* unicast packet */ - case BAT_UNICAST: - ret = recv_unicast_packet(skb, hard_iface); - break; - - /* fragmented unicast packet */ - case BAT_UNICAST_FRAG: - ret = recv_ucast_frag_packet(skb, hard_iface); - break; - - /* broadcast packet */ - case BAT_BCAST: - ret = recv_bcast_packet(skb, hard_iface); - break; - - /* vis packet */ - case BAT_VIS: - ret = recv_vis_packet(skb, hard_iface); - break; - /* Translation table query (request or response) */ - case BAT_TT_QUERY: - ret = recv_tt_query(skb, hard_iface); - break; - /* Roaming advertisement */ - case BAT_ROAM_ADV: - ret = recv_roam_adv(skb, hard_iface); - break; - default: - ret = NET_RX_DROP; - } - - if (ret == NET_RX_DROP) - kfree_skb(skb); - - /* return NET_RX_SUCCESS in any case as we - * most probably dropped the packet for - * routing-logical reasons. */ - - return NET_RX_SUCCESS; - -err_free: - kfree_skb(skb); -err_out: - return NET_RX_DROP; -} - /* This function returns true if the interface represented by ifindex is a * 802.11 wireless device */ bool is_wifi_iface(int ifindex) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 7913272..d19b935 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -39,6 +39,7 @@ /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked */ struct list_head hardif_list; +static int (*recv_packet_handler[256])(struct sk_buff *, struct hard_iface *); char bat_routing_algo[20] = "BATMAN IV"; static struct hlist_head bat_algo_list; @@ -46,11 +47,15 @@ unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; struct workqueue_struct *bat_event_workqueue; +static void recv_handler_init(void); + static int __init batman_init(void) { INIT_LIST_HEAD(&hardif_list); INIT_HLIST_HEAD(&bat_algo_list); + recv_handler_init(); + bat_iv_init(); /* the name should not be longer than 10 chars - see @@ -179,6 +184,122 @@ int is_my_mac(const uint8_t *addr) return 0; } +static int recv_unhandled_packet(struct sk_buff *skb, + struct hard_iface *recv_if) +{ + return NET_RX_DROP; +} + +/* incoming packets with the batman ethertype received on any active hard + * interface + */ +int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, struct net_device *orig_dev) +{ + struct bat_priv *bat_priv; + struct batman_ogm_packet *batman_ogm_packet; + struct hard_iface *hard_iface; + uint8_t idx; + int ret; + + hard_iface = container_of(ptype, struct hard_iface, batman_adv_ptype); + skb = skb_share_check(skb, GFP_ATOMIC); + + /* skb was released by skb_share_check() */ + if (!skb) + goto err_out; + + /* packet should hold at least type and version */ + if (unlikely(!pskb_may_pull(skb, 2))) + goto err_free; + + /* expect a valid ethernet header here. */ + if (unlikely(skb->mac_len != ETH_HLEN || !skb_mac_header(skb))) + goto err_free; + + if (!hard_iface->soft_iface) + goto err_free; + + bat_priv = netdev_priv(hard_iface->soft_iface); + + if (atomic_read(&bat_priv->mesh_state) != MESH_ACTIVE) + goto err_free; + + /* discard frames on not active interfaces */ + if (hard_iface->if_status != IF_ACTIVE) + goto err_free; + + batman_ogm_packet = (struct batman_ogm_packet *)skb->data; + + if (batman_ogm_packet->header.version != COMPAT_VERSION) { + bat_dbg(DBG_BATMAN, bat_priv, + "Drop packet: incompatible batman version (%i)\n", + batman_ogm_packet->header.version); + goto err_free; + } + + /* all receive handlers return whether they received or reused + * the supplied skb. if not, we have to free the skb. + */ + idx = batman_ogm_packet->header.packet_type; + ret = (*recv_packet_handler[idx])(skb, hard_iface); + + if (ret == NET_RX_DROP) + kfree_skb(skb); + + /* return NET_RX_SUCCESS in any case as we + * most probably dropped the packet for + * routing-logical reasons. + */ + return NET_RX_SUCCESS; + +err_free: + kfree_skb(skb); +err_out: + return NET_RX_DROP; +} + +static void recv_handler_init(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(recv_packet_handler); i++) + recv_packet_handler[i] = recv_unhandled_packet; + + /* batman originator packet */ + recv_packet_handler[BAT_IV_OGM] = recv_bat_ogm_packet; + /* batman icmp packet */ + recv_packet_handler[BAT_ICMP] = recv_icmp_packet; + /* unicast packet */ + recv_packet_handler[BAT_UNICAST] = recv_unicast_packet; + /* fragmented unicast packet */ + recv_packet_handler[BAT_UNICAST_FRAG] = recv_ucast_frag_packet; + /* broadcast packet */ + recv_packet_handler[BAT_BCAST] = recv_bcast_packet; + /* vis packet */ + recv_packet_handler[BAT_VIS] = recv_vis_packet; + /* Translation table query (request or response) */ + recv_packet_handler[BAT_TT_QUERY] = recv_tt_query; + /* Roaming advertisement */ + recv_packet_handler[BAT_ROAM_ADV] = recv_roam_adv; +} + +int recv_handler_register(uint8_t packet_type, + int (*recv_handler)(struct sk_buff *, + struct hard_iface *)) +{ + if (recv_packet_handler[packet_type] != &recv_unhandled_packet) + return -EBUSY; + + recv_packet_handler[packet_type] = recv_handler; + return 0; +} + +void recv_handler_unregister(uint8_t packet_type) +{ + recv_packet_handler[packet_type] = recv_unhandled_packet; +} + static struct bat_algo_ops *bat_algo_get(char *name) { struct bat_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp; diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index d9832ac..fd83acd 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -155,6 +155,12 @@ void mesh_free(struct net_device *soft_iface); void inc_module_count(void); void dec_module_count(void); int is_my_mac(const uint8_t *addr); +int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, struct net_device *orig_dev); +int recv_handler_register(uint8_t packet_type, + int (*recv_handler)(struct sk_buff *, + struct hard_iface *)); +void recv_handler_unregister(uint8_t packet_type); int bat_algo_register(struct bat_algo_ops *bat_algo_ops); int bat_algo_select(struct bat_priv *bat_priv, char *name); int bat_algo_seq_print_text(struct seq_file *seq, void *offset); -- LinuxNextTracking

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20120514
by batman＠open-mesh.org 14 May '12

14 May '12

The following commit has been merged in the master branch: commit 9205cc521ec74bd510857a464d4ac4edee949bfd Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Feb 27 11:29:53 2012 +0100 batman-adv: fix wrong dhcp option list browsing In is_type_dhcprequest(), while parsing a DHCP message, if the entry we found in the option list is neither a padding nor the dhcp-type, we have to ignore it and jump as many bytes as its length + 1. The "+ 1" byte is given by the subtype field itself that has to be jumped too. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 6f9b9b7..47f7186 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -558,10 +558,10 @@ static bool is_type_dhcprequest(struct sk_buff *skb, int header_len) p++; /* ...and then we jump over the data */ - if (pkt_len < *p) + if (pkt_len < 1 + (*p)) goto out; - pkt_len -= *p; - p += (*p); + pkt_len -= 1 + (*p); + p += 1 + (*p); } } out: -- LinuxNextTracking

1 0

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

14 May '12

--- batman-adv_master.packet.h 2012-05-15 00:15:01.127139896 +0200 +++ batctl_master.packet.h 2012-05-15 00:15:01.219134716 +0200 @@ -1,4 +1,5 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * @@ -15,6 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA + * */ #ifndef _NET_BATMAN_ADV_PACKET_H_ @@ -87,8 +89,7 @@ /* TT_CLIENT flags. * Flags from 1 to 1 << 7 are sent on the wire, while flags from 1 << 8 to - * 1 << 15 are used for local computation only - */ + * 1 << 15 are used for local computation only */ enum tt_client_flags { TT_CLIENT_DEL = 1 << 0, TT_CLIENT_ROAM = 1 << 1, @@ -149,8 +150,7 @@ #define BAT_RR_LEN 16 /* icmp_packet_rr must start with all fields from imcp_packet - * as this is assumed by code that handles ICMP packets - */ + * as this is assumed by code that handles ICMP packets */ struct icmp_packet_rr { struct batman_header header; uint8_t msg_type; /* see ICMP message types above */ @@ -206,8 +206,7 @@ struct batman_header header; /* the flag field is a combination of: * - TT_REQUEST or TT_RESPONSE - * - TT_FULL_TABLE - */ + * - TT_FULL_TABLE */ uint8_t flags; uint8_t dst[ETH_ALEN]; uint8_t src[ETH_ALEN]; @@ -215,15 +214,13 @@ * if TT_REQUEST: ttvn that triggered the * request * if TT_RESPONSE: new ttvn for the src - * orig_node - */ + * orig_node */ uint8_t ttvn; /* tt_data field is: * if TT_REQUEST: crc associated with the * ttvn - * if TT_RESPONSE: table_size - */ - __be16 tt_data; + * if TT_RESPONSE: table_size */ + __be16 tt_data; } __packed; struct roam_adv_packet {

1 0

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

13 May '12

Name of failed tests ==================== Comment ending without space master Comment ending without space next Multiline comment ending at a non-empty line master Multiline comment ending at a non-empty line next Multiline comment starting with empty line master Multiline comment starting with empty line next unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=n unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y Output of different failed tests ================================ Comment ending without space master: >>>>>>>> bat_sysfs.c:156: * unsigned integer value*/ bridge_loop_avoidance.c:1200: **/ gateway_client.c:161: **/ gateway_client.c:198: **/ gateway_client.c:284: **/ gateway_common.c:163: **/ routing.c:704: * refcount.*/ soft-interface.c:312:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/ vis.c:503: * hash.*/ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ types.h:403: /* vis_info may follow here*/ Comment ending without space next: >>>>>>>> bat_sysfs.c:156: * unsigned integer value*/ bridge_loop_avoidance.c:1187: **/ gateway_client.c:159: **/ gateway_client.c:196: **/ gateway_client.c:281: **/ gateway_common.c:162: **/ routing.c:702: * refcount.*/ soft-interface.c:305:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/ vis.c:496: * hash.*/ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ types.h:380: /* vis_info may follow here*/ Multiline comment ending at a non-empty line master: >>>>>>>> bat_iv_ogm.c:170: * ordinary base packet */ bat_iv_ogm.c:319: * are flooded through the net */ bat_iv_ogm.c:325: * interfaces leave only that interface */ bat_iv_ogm.c:333: * interface only - we still can aggregate */ bat_iv_ogm.c:340: * (= secondary interface packets in general) */ bat_iv_ogm.c:486: * suitable aggregation packet found */ bat_iv_ogm.c:690: * to change */ bat_iv_ogm.c:700: * won't consider it either */ bat_iv_ogm.c:722: * sent through a primary interface */ bat_iv_ogm.c:819: * information */ bat_iv_ogm.c:845: * consider it bidirectional */ bat_iv_ogm.c:1037: * come via the corresponding interface */ bat_iv_ogm.c:1115: * originator mac */ bat_iv_ogm.c:1125: * don't route towards it */ bat_iv_ogm.c:1138: * seqno and similar ttl as the non-duplicate */ bat_sysfs.c:87: * (bat_priv) on or off */ bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */ bat_sysfs.c:156: * unsigned integer value*/ bitarray.c:49: * higher than this one, so we just mark it. */ bitarray.c:58: * set the mark if required */ bitarray.c:84: * seqno window is protected. */ distributed-arp-table.c:335: * IP information */ distributed-arp-table.c:349: * will simply ignore it */ gateway_client.c:36: * the beginning of the dhcp header */ gateway_client.c:537: * - octet 3: option data */ gateway_client.c:542: * Jump the len octet and go to the data octet */ gateway_client.c:670: * set the tq towards ourself as the maximum value */ gateway_client.c:684: * reliable enough */ hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */ hard-interface.c:550: * 802.11 wireless device */ hard-interface.c:565: * check for wireless_handlers != NULL */ icmp_socket.c:315: * deleted */ main.c:40: * list traversals just rcu-locked */ main.c:62: * http://lwn.net/Articles/23634/ */ originator.c:192: * address if it does not exits */ originator.c:524: * if_num */ originator.c:607: * if_num */ routing.c:180: * considered as candidate. */ routing.c:476: * returned router's refcount. */ routing.c:509: * after the current router */ routing.c:512: * does not exist as rcu version */ routing.c:527: * Increases the returned router's refcount */ routing.c:548: * or this one is better, choose it. */ routing.c:552: * previously selected router */ routing.c:604: * forwarded */ routing.c:618: * changes */ routing.c:693: * packets for the correct destination. */ routing.c:704: * refcount.*/ routing.c:723: * always choose the default router. */ routing.c:736: * for a potential bonding candidate. */ routing.c:741: * even be the same as our router_orig in many cases */ routing.c:755: * bonding and prefer the original router. */ routing.c:761: * in. */ routing.c:1086: * if required. */ send.c:36: * specified batman interface */ send.c:73: * (which is > 0). This will not be treated as an error. */ send.c:136: * skb is freed. */ soft-interface.c:185: * requests into the mesh */ soft-interface.c:192: * via unicast to their gateway */ soft-interface.c:223: * this mac is known throughout the mesh */ soft-interface.c:234: * the original skb. */ soft-interface.c:310: * -- Dec 21st 2009, Simon Wunderlich */ translation-table.c:235: * (consistency check) */ translation-table.c:440: * response issued before the net ttvn increment (consistency check) */ translation-table.c:901: * the global entry, since it is useless now. */ translation-table.c:1074: * isolation */ translation-table.c:1173: * account while computing the CRC */ translation-table.c:1210: * last OGM (the OGM could carry no changes) */ translation-table.c:1239: * has already been issued for this orig_node, NULL otherwise */ translation-table.c:1349: * copied */ translation-table.c:1372: * reply from the same orig_node yet */ translation-table.c:1480: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1592: * is too big send the whole local translation table */ translation-table.c:1600: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1766: * consistency purpose) */ translation-table.c:1817: * unset the flag */ translation-table.c:1874: * returns true if the ROAMING_ADV can be sent, false otherwise */ translation-table.c:1883: * reply from the same orig_node yet */ translation-table.c:1926: * already roamed to us too many times */ translation-table.c:2000: * in the given hash table and returns the number of modified entries */ translation-table.c:2170: * increased by one -> we can apply the attached changes */ translation-table.c:2175: * In this case send a tt request */ translation-table.c:2186: * in the global table */ translation-table.c:2196: * inconsistency */ translation-table.c:2201: * unset the flag */ translation-table.c:2205: * in sync anymore -> request fresh tt data */ unicast.c:368: * returns NULL in case of AP isolation */ vis.c:121: * does not already exist in the list */ vis.c:337: * already linked in. */ vis.c:347: * linked in. */ vis.c:391: * is newer than old entries in the hash. */ vis.c:503: * hash.*/ vis.c:557: * Must be called with the originator hash locked */ vis.c:608: * returns 0 on success, -1 if no packet could be generated */ vis.c:706: * held */ vis.c:765: * this node. */ vis.c:881: * initialized (e.g. bat0 is initialized, interfaces have been added) */ bitarray.h:26: * and curr_seqno is within range of last_seqno */ bitarray.h:50: * new, 0 if old */ hash.h:30: * same */ hash.h:35: * argument and the size the second */ hash.h:57: * elements, memory might be leaked. */ hash.h:137: * comparing. */ main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ main.h:48: * (should be a multiple of our word size) */ main.h:51: * pending tt_req */ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ main.h:84: * candidates */ main.h:88: * forw_packet->direct_link_flags */ main.h:254: * - after adding more than 127 to the starting value - it is a successor */ packet.h:92: * 1 << 15 are used for local computation only */ packet.h:153: * as this is assumed by code that handles ICMP packets */ packet.h:209: * - TT_FULL_TABLE */ packet.h:217: * orig_node */ packet.h:222: * if TT_RESPONSE: table_size */ types.h:103: * soon as I receive a new TTVN from this orig_node */ types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */ types.h:214: * increase my TTVN */ types.h:395: * from. we should not reply to them. */ vis.h:26: * in miliseconds */ Multiline comment ending at a non-empty line next: >>>>>>>> bat_iv_ogm.c:169: * ordinary base packet */ bat_iv_ogm.c:314: * are flooded through the net */ bat_iv_ogm.c:320: * interfaces leave only that interface */ bat_iv_ogm.c:328: * interface only - we still can aggregate */ bat_iv_ogm.c:335: * (= secondary interface packets in general) */ bat_iv_ogm.c:481: * suitable aggregation packet found */ bat_iv_ogm.c:685: * to change */ bat_iv_ogm.c:695: * won't consider it either */ bat_iv_ogm.c:717: * sent through a primary interface */ bat_iv_ogm.c:814: * information */ bat_iv_ogm.c:840: * consider it bidirectional */ bat_iv_ogm.c:1031: * come via the corresponding interface */ bat_iv_ogm.c:1109: * originator mac */ bat_iv_ogm.c:1119: * don't route towards it */ bat_iv_ogm.c:1132: * seqno and similar ttl as the non-duplicate */ bat_sysfs.c:87: * (bat_priv) on or off */ bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */ bat_sysfs.c:156: * unsigned integer value*/ bitarray.c:49: * higher than this one, so we just mark it. */ bitarray.c:58: * set the mark if required */ bitarray.c:84: * seqno window is protected. */ distributed-arp-table.c:336: * IP information */ distributed-arp-table.c:350: * will simply ignore it */ gateway_client.c:36: * the beginning of the dhcp header */ gateway_client.c:533: * - octet 3: option data */ gateway_client.c:538: * Jump the len octet and go to the data octet */ gateway_client.c:666: * set the tq towards ourself as the maximum value */ gateway_client.c:680: * reliable enough */ hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */ hard-interface.c:550: * 802.11 wireless device */ hard-interface.c:565: * check for wireless_handlers != NULL */ icmp_socket.c:315: * deleted */ main.c:40: * list traversals just rcu-locked */ main.c:62: * http://lwn.net/Articles/23634/ */ originator.c:192: * address if it does not exits */ originator.c:523: * if_num */ originator.c:606: * if_num */ routing.c:180: * considered as candidate. */ routing.c:476: * returned router's refcount. */ routing.c:509: * after the current router */ routing.c:512: * does not exist as rcu version */ routing.c:527: * Increases the returned router's refcount */ routing.c:548: * or this one is better, choose it. */ routing.c:552: * previously selected router */ routing.c:604: * forwarded */ routing.c:617: * changes */ routing.c:691: * packets for the correct destination. */ routing.c:702: * refcount.*/ routing.c:721: * always choose the default router. */ routing.c:734: * for a potential bonding candidate. */ routing.c:739: * even be the same as our router_orig in many cases */ routing.c:753: * bonding and prefer the original router. */ routing.c:759: * in. */ routing.c:1080: * if required. */ send.c:36: * specified batman interface */ send.c:73: * (which is > 0). This will not be treated as an error. */ send.c:109: * and wait for the tt table request which will be fragmented */ send.c:208: * skb is freed. */ soft-interface.c:178: * requests into the mesh */ soft-interface.c:185: * via unicast to their gateway */ soft-interface.c:216: * this mac is known throughout the mesh */ soft-interface.c:227: * the original skb. */ soft-interface.c:303: * -- Dec 21st 2009, Simon Wunderlich */ translation-table.c:235: * (consistency check) */ translation-table.c:308: * problems */ translation-table.c:392: * response issued before the net ttvn increment (consistency check) */ translation-table.c:853: * the global entry, since it is useless now. */ translation-table.c:1026: * isolation */ translation-table.c:1125: * account while computing the CRC */ translation-table.c:1162: * last OGM (the OGM could carry no changes) */ translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */ translation-table.c:1301: * copied */ translation-table.c:1324: * reply from the same orig_node yet */ translation-table.c:1430: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1540: * is too big send the whole local translation table */ translation-table.c:1548: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1712: * consistency purpose) */ translation-table.c:1761: * unset the flag */ translation-table.c:1814: * returns true if the ROAMING_ADV can be sent, false otherwise */ translation-table.c:1823: * reply from the same orig_node yet */ translation-table.c:1866: * already roamed to us too many times */ translation-table.c:1938: * in the given hash table and returns the number of modified entries */ translation-table.c:2019: * entries */ translation-table.c:2072: * increased by one -> we can apply the attached changes */ translation-table.c:2077: * In this case send a tt request */ translation-table.c:2088: * in the global table */ translation-table.c:2098: * inconsistency */ translation-table.c:2103: * unset the flag */ translation-table.c:2107: * in sync anymore -> request fresh tt data */ unicast.c:368: * returns NULL in case of AP isolation */ vis.c:121: * does not already exist in the list */ vis.c:330: * already linked in. */ vis.c:340: * linked in. */ vis.c:384: * is newer than old entries in the hash. */ vis.c:496: * hash.*/ vis.c:550: * Must be called with the originator hash locked */ vis.c:601: * returns 0 on success, -1 if no packet could be generated */ vis.c:699: * held */ vis.c:758: * this node. */ vis.c:874: * initialized (e.g. bat0 is initialized, interfaces have been added) */ bitarray.h:26: * and curr_seqno is within range of last_seqno */ bitarray.h:50: * new, 0 if old */ hash.h:30: * same */ hash.h:35: * argument and the size the second */ hash.h:53: * elements, memory might be leaked. */ hash.h:136: * comparing. */ main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ main.h:48: * (should be a multiple of our word size) */ main.h:51: * pending tt_req */ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ main.h:84: * candidates */ main.h:88: * forw_packet->direct_link_flags */ main.h:252: * - after adding more than 127 to the starting value - it is a successor */ packet.h:92: * 1 << 15 are used for local computation only */ packet.h:153: * as this is assumed by code that handles ICMP packets */ packet.h:209: * - TT_FULL_TABLE */ packet.h:217: * orig_node */ packet.h:222: * if TT_RESPONSE: table_size */ types.h:103: * soon as I receive a new TTVN from this orig_node */ types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */ types.h:191: * increase my TTVN */ types.h:372: * from. we should not reply to them. */ vis.h:26: * in miliseconds */ Multiline comment starting with empty line master: >>>>>>>> bat_debugfs.c:1:/* bat_iv_ogm.c:1:/* bat_iv_ogm.c:291: /** bat_iv_ogm.c:305: /** bat_iv_ogm.c:456: /** bat_iv_ogm.c:491: /** bat_sysfs.c:1:/* bitarray.c:1:/* bridge_loop_avoidance.c:1:/* bridge_loop_avoidance.c:126:/** bridge_loop_avoidance.c:165:/** bridge_loop_avoidance.c:244:/** bridge_loop_avoidance.c:350:/** bridge_loop_avoidance.c:425:/** bridge_loop_avoidance.c:471:/** bridge_loop_avoidance.c:498:/** bridge_loop_avoidance.c:519:/** bridge_loop_avoidance.c:734:/** bridge_loop_avoidance.c:813:/** bridge_loop_avoidance.c:966:/** bridge_loop_avoidance.c:1014:/** bridge_loop_avoidance.c:1186:/** bridge_loop_avoidance.c:1253:/** bridge_loop_avoidance.c:1294:/** bridge_loop_avoidance.c:1363:/** bridge_loop_avoidance.c:1452:/** compat.c:1:/* distributed-arp-table.c:1:/* gateway_client.c:1:/* gateway_client.c:154: default: /** gateway_client.c:193: /** gateway_client.c:281: /** gateway_client.c:340: /** gateway_client.c:429:/** gateway_common.c:1:/* gateway_common.c:159: /** hard-interface.c:1:/* hard-interface.c:237: /** hard-interface.c:444: /** hash.c:1:/* icmp_socket.c:1:/* main.c:1:/* originator.c:1:/* ring_buffer.c:1:/* routing.c:1:/* routing.c:168: /** routing.c:400: /** send.c:1:/* send.c:89: /** send.c:254: /** send.c:290: /** send.c:300: /** send.c:319: /** send.c:329: /** soft-interface.c:1:/* soft-interface.c:69: /** soft-interface.c:357: /** translation-table.c:1:/* unicast.c:1:/* unicast.c:372: /** vis.c:1:/* bat_algo.h:1:/* bat_debugfs.h:1:/* bat_sysfs.h:1:/* bitarray.h:1:/* bridge_loop_avoidance.h:1:/* compat.h:1:/* distributed-arp-table.h:1:/* gateway_client.h:1:/* gateway_common.h:1:/* hard-interface.h:1:/* hash.h:1:/* hash.h:83:/** icmp_socket.h:1:/* main.h:1:/* main.h:218:/** main.h:229:/** originator.h:1:/* packet.h:1:/* ring_buffer.h:1:/* routing.h:1:/* send.h:1:/* soft-interface.h:1:/* translation-table.h:1:/* types.h:1:/* types.h:63:/** types.h:135:/** types.h:352:/** unicast.h:1:/* vis.h:1:/* Multiline comment starting with empty line next: >>>>>>>> bat_debugfs.c:1:/* bat_iv_ogm.c:1:/* bat_iv_ogm.c:286: /** bat_iv_ogm.c:300: /** bat_iv_ogm.c:451: /** bat_iv_ogm.c:486: /** bat_sysfs.c:1:/* bitarray.c:1:/* bridge_loop_avoidance.c:1:/* bridge_loop_avoidance.c:126:/** bridge_loop_avoidance.c:165:/** bridge_loop_avoidance.c:244:/** bridge_loop_avoidance.c:350:/** bridge_loop_avoidance.c:425:/** bridge_loop_avoidance.c:471:/** bridge_loop_avoidance.c:498:/** bridge_loop_avoidance.c:519:/** bridge_loop_avoidance.c:734:/** bridge_loop_avoidance.c:813:/** bridge_loop_avoidance.c:966:/** bridge_loop_avoidance.c:1014:/** bridge_loop_avoidance.c:1173:/** bridge_loop_avoidance.c:1240:/** bridge_loop_avoidance.c:1281:/** bridge_loop_avoidance.c:1350:/** bridge_loop_avoidance.c:1439:/** compat.c:1:/* distributed-arp-table.c:1:/* gateway_client.c:1:/* gateway_client.c:152: default: /** gateway_client.c:191: /** gateway_client.c:278: /** gateway_client.c:337: /** gateway_client.c:425:/** gateway_common.c:1:/* gateway_common.c:158: /** hard-interface.c:1:/* hard-interface.c:237: /** hard-interface.c:444: /** hash.c:1:/* icmp_socket.c:1:/* main.c:1:/* originator.c:1:/* ring_buffer.c:1:/* routing.c:1:/* routing.c:168: /** routing.c:400: /** send.c:1:/* send.c:142: /** send.c:326: /** send.c:362: /** send.c:372: /** send.c:391: /** send.c:401: /** soft-interface.c:1:/* soft-interface.c:62: /** soft-interface.c:350: /** translation-table.c:1:/* translation-table.c:310: /** unicast.c:1:/* unicast.c:372: /** vis.c:1:/* bat_algo.h:1:/* bat_debugfs.h:1:/* bat_sysfs.h:1:/* bitarray.h:1:/* bridge_loop_avoidance.h:1:/* compat.h:1:/* distributed-arp-table.h:1:/* gateway_client.h:1:/* gateway_common.h:1:/* hard-interface.h:1:/* hash.h:1:/* hash.h:79:/** icmp_socket.h:1:/* main.h:1:/* main.h:216:/** main.h:227:/** originator.h:1:/* packet.h:1:/* ring_buffer.h:1:/* routing.h:1:/* send.h:1:/* soft-interface.h:1:/* translation-table.h:1:/* types.h:1:/* types.h:63:/** types.h:135:/** types.h:329:/** unicast.h:1:/* vis.h:1:/* unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> prepare_unicast_4addr_packet tt_local_crc unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> tt_local_crc unused_symbols next linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> prepare_unicast_4addr_packet wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> add_bcast_packet_to_list bat_algo_register bat_algo_select bat_algo_seq_print_text bat_event_workqueue bat_routing_algo bat_socket_init bat_socket_receive_packet bat_socket_setup batman_skb_recv bonding_candidate_add bonding_candidate_del bonding_save_primary broadcast_addr check_management_packet dec_module_count find_router frag_list_free frag_reassemble_skb frag_send_skb get_orig_node handle_tt_response hard_if_notifier hardif_disable_interface hardif_enable_interface hardif_free_rcu hardif_get_by_netdev hardif_list hardif_min_mtu hardif_remove_interfaces hash_destroy hash_new inc_module_count interface_rx is_ap_isolated is_my_client is_my_mac is_wifi_iface mesh_free mesh_init my_skb_head_push neigh_node_free_ref orig_hash_add_if orig_hash_del_if orig_node_free_ref orig_node_get_router orig_seq_print_text originator_free originator_init prepare_unicast_4addr_packet purge_orig_ref purge_outstanding_packets receive_client_update_packet receive_server_sync_packet recv_bcast_packet recv_handler_register recv_handler_unregister recv_icmp_packet recv_roam_adv recv_tt_query recv_ucast_frag_packet recv_unicast_packet recv_vis_packet ring_buffer_avg ring_buffer_set schedule_bat_ogm send_outstanding_bat_ogm_packet send_skb_packet send_tt_response slide_own_bcast_window softif_create softif_destroy softif_is_valid transtable_search tt_free tt_global_add tt_global_client_is_roaming tt_global_del_orig tt_global_seq_print_text tt_init tt_len tt_local_add tt_local_crc tt_local_remove tt_local_seq_print_text tt_update_orig unicast_generic_send_skb update_min_mtu update_route vis_init vis_quit vis_seq_print_text window_protected

1 0

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

12 May '12

Name of failed tests ==================== Comment ending without space master Comment ending without space next Multiline comment ending at a non-empty line master Multiline comment ending at a non-empty line next Multiline comment starting with empty line master Multiline comment starting with empty line next unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.29 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.30 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.31 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.32 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.34 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.35 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.36 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.37 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.38 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-2.6.39 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.0 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.1 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.2 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y Output of different failed tests ================================ Comment ending without space master: >>>>>>>> bat_sysfs.c:156: * unsigned integer value*/ bridge_loop_avoidance.c:1199: **/ gateway_client.c:159: **/ gateway_client.c:196: **/ gateway_client.c:281: **/ gateway_common.c:162: **/ routing.c:704: * refcount.*/ soft-interface.c:312:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/ vis.c:503: * hash.*/ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ types.h:403: /* vis_info may follow here*/ Comment ending without space next: >>>>>>>> bat_sysfs.c:156: * unsigned integer value*/ bridge_loop_avoidance.c:1187: **/ gateway_client.c:159: **/ gateway_client.c:196: **/ gateway_client.c:281: **/ gateway_common.c:162: **/ routing.c:702: * refcount.*/ soft-interface.c:305:/* skb->ip_summed = CHECKSUM_UNNECESSARY;*/ vis.c:496: * hash.*/ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ types.h:380: /* vis_info may follow here*/ Multiline comment ending at a non-empty line master: >>>>>>>> bat_iv_ogm.c:170: * ordinary base packet */ bat_iv_ogm.c:319: * are flooded through the net */ bat_iv_ogm.c:325: * interfaces leave only that interface */ bat_iv_ogm.c:333: * interface only - we still can aggregate */ bat_iv_ogm.c:340: * (= secondary interface packets in general) */ bat_iv_ogm.c:486: * suitable aggregation packet found */ bat_iv_ogm.c:690: * to change */ bat_iv_ogm.c:700: * won't consider it either */ bat_iv_ogm.c:722: * sent through a primary interface */ bat_iv_ogm.c:819: * information */ bat_iv_ogm.c:845: * consider it bidirectional */ bat_iv_ogm.c:1037: * come via the corresponding interface */ bat_iv_ogm.c:1115: * originator mac */ bat_iv_ogm.c:1125: * don't route towards it */ bat_iv_ogm.c:1138: * seqno and similar ttl as the non-duplicate */ bat_sysfs.c:87: * (bat_priv) on or off */ bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */ bat_sysfs.c:156: * unsigned integer value*/ bitarray.c:49: * higher than this one, so we just mark it. */ bitarray.c:58: * set the mark if required */ bitarray.c:84: * seqno window is protected. */ distributed-arp-table.c:335: * IP information */ distributed-arp-table.c:349: * will simply ignore it */ gateway_client.c:36: * the beginning of the dhcp header */ gateway_client.c:533: * - octet 3: option data */ gateway_client.c:538: * Jump the len octet and go to the data octet */ gateway_client.c:666: * set the tq towards ourself as the maximum value */ gateway_client.c:680: * reliable enough */ hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */ hard-interface.c:550: * 802.11 wireless device */ hard-interface.c:565: * check for wireless_handlers != NULL */ icmp_socket.c:315: * deleted */ main.c:40: * list traversals just rcu-locked */ main.c:62: * http://lwn.net/Articles/23634/ */ originator.c:192: * address if it does not exits */ originator.c:523: * if_num */ originator.c:606: * if_num */ routing.c:180: * considered as candidate. */ routing.c:476: * returned router's refcount. */ routing.c:509: * after the current router */ routing.c:512: * does not exist as rcu version */ routing.c:527: * Increases the returned router's refcount */ routing.c:548: * or this one is better, choose it. */ routing.c:552: * previously selected router */ routing.c:604: * forwarded */ routing.c:618: * changes */ routing.c:693: * packets for the correct destination. */ routing.c:704: * refcount.*/ routing.c:723: * always choose the default router. */ routing.c:736: * for a potential bonding candidate. */ routing.c:741: * even be the same as our router_orig in many cases */ routing.c:755: * bonding and prefer the original router. */ routing.c:761: * in. */ routing.c:931: * not try to reroute the packet!! */ routing.c:1085: * if required. */ send.c:36: * specified batman interface */ send.c:73: * (which is > 0). This will not be treated as an error. */ send.c:136: * skb is freed. */ soft-interface.c:185: * requests into the mesh */ soft-interface.c:192: * via unicast to their gateway */ soft-interface.c:223: * this mac is known throughout the mesh */ soft-interface.c:234: * the original skb. */ soft-interface.c:310: * -- Dec 21st 2009, Simon Wunderlich */ translation-table.c:235: * (consistency check) */ translation-table.c:440: * response issued before the net ttvn increment (consistency check) */ translation-table.c:901: * the global entry, since it is useless now. */ translation-table.c:1074: * isolation */ translation-table.c:1173: * account while computing the CRC */ translation-table.c:1210: * last OGM (the OGM could carry no changes) */ translation-table.c:1239: * has already been issued for this orig_node, NULL otherwise */ translation-table.c:1349: * copied */ translation-table.c:1372: * reply from the same orig_node yet */ translation-table.c:1480: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1592: * is too big send the whole local translation table */ translation-table.c:1600: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1766: * consistency purpose) */ translation-table.c:1817: * unset the flag */ translation-table.c:1874: * returns true if the ROAMING_ADV can be sent, false otherwise */ translation-table.c:1883: * reply from the same orig_node yet */ translation-table.c:1926: * already roamed to us too many times */ translation-table.c:2000: * in the given hash table and returns the number of modified entries */ translation-table.c:2170: * increased by one -> we can apply the attached changes */ translation-table.c:2175: * In this case send a tt request */ translation-table.c:2186: * in the global table */ translation-table.c:2196: * inconsistency */ translation-table.c:2201: * unset the flag */ translation-table.c:2205: * in sync anymore -> request fresh tt data */ translation-table.c:2223: * purposes */ unicast.c:368: * returns NULL in case of AP isolation */ unicast.c:401: * than the current one */ vis.c:121: * does not already exist in the list */ vis.c:337: * already linked in. */ vis.c:347: * linked in. */ vis.c:391: * is newer than old entries in the hash. */ vis.c:503: * hash.*/ vis.c:557: * Must be called with the originator hash locked */ vis.c:608: * returns 0 on success, -1 if no packet could be generated */ vis.c:706: * held */ vis.c:765: * this node. */ vis.c:881: * initialized (e.g. bat0 is initialized, interfaces have been added) */ bitarray.h:26: * and curr_seqno is within range of last_seqno */ bitarray.h:50: * new, 0 if old */ hash.h:30: * same */ hash.h:35: * argument and the size the second */ hash.h:56: * elements, memory might be leaked. */ hash.h:136: * comparing. */ main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ main.h:48: * (should be a multiple of our word size) */ main.h:51: * pending tt_req */ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ main.h:84: * candidates */ main.h:88: * forw_packet->direct_link_flags */ main.h:253: * - after adding more than 127 to the starting value - it is a successor */ packet.h:92: * 1 << 15 are used for local computation only */ packet.h:153: * as this is assumed by code that handles ICMP packets */ packet.h:209: * - TT_FULL_TABLE */ packet.h:217: * orig_node */ packet.h:222: * if TT_RESPONSE: table_size */ types.h:103: * soon as I receive a new TTVN from this orig_node */ types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */ types.h:214: * increase my TTVN */ types.h:395: * from. we should not reply to them. */ vis.h:26: * in miliseconds */ Multiline comment ending at a non-empty line next: >>>>>>>> bat_iv_ogm.c:169: * ordinary base packet */ bat_iv_ogm.c:314: * are flooded through the net */ bat_iv_ogm.c:320: * interfaces leave only that interface */ bat_iv_ogm.c:328: * interface only - we still can aggregate */ bat_iv_ogm.c:335: * (= secondary interface packets in general) */ bat_iv_ogm.c:481: * suitable aggregation packet found */ bat_iv_ogm.c:685: * to change */ bat_iv_ogm.c:695: * won't consider it either */ bat_iv_ogm.c:717: * sent through a primary interface */ bat_iv_ogm.c:814: * information */ bat_iv_ogm.c:840: * consider it bidirectional */ bat_iv_ogm.c:1031: * come via the corresponding interface */ bat_iv_ogm.c:1109: * originator mac */ bat_iv_ogm.c:1119: * don't route towards it */ bat_iv_ogm.c:1132: * seqno and similar ttl as the non-duplicate */ bat_sysfs.c:87: * (bat_priv) on or off */ bat_sysfs.c:113: * (bat_priv) to an unsigned integer value */ bat_sysfs.c:156: * unsigned integer value*/ bitarray.c:49: * higher than this one, so we just mark it. */ bitarray.c:58: * set the mark if required */ bitarray.c:84: * seqno window is protected. */ distributed-arp-table.c:336: * IP information */ distributed-arp-table.c:350: * will simply ignore it */ gateway_client.c:36: * the beginning of the dhcp header */ gateway_client.c:533: * - octet 3: option data */ gateway_client.c:538: * Jump the len octet and go to the data octet */ gateway_client.c:666: * set the tq towards ourself as the maximum value */ gateway_client.c:680: * reliable enough */ hard-interface.c:191: * (have MTU > 1500 + BAT_HEADER_LEN) */ hard-interface.c:550: * 802.11 wireless device */ hard-interface.c:565: * check for wireless_handlers != NULL */ icmp_socket.c:315: * deleted */ main.c:40: * list traversals just rcu-locked */ main.c:62: * http://lwn.net/Articles/23634/ */ originator.c:192: * address if it does not exits */ originator.c:523: * if_num */ originator.c:606: * if_num */ routing.c:180: * considered as candidate. */ routing.c:476: * returned router's refcount. */ routing.c:509: * after the current router */ routing.c:512: * does not exist as rcu version */ routing.c:527: * Increases the returned router's refcount */ routing.c:548: * or this one is better, choose it. */ routing.c:552: * previously selected router */ routing.c:604: * forwarded */ routing.c:617: * changes */ routing.c:691: * packets for the correct destination. */ routing.c:702: * refcount.*/ routing.c:721: * always choose the default router. */ routing.c:734: * for a potential bonding candidate. */ routing.c:739: * even be the same as our router_orig in many cases */ routing.c:753: * bonding and prefer the original router. */ routing.c:759: * in. */ routing.c:925: * not try to reroute the packet!! */ routing.c:1079: * if required. */ send.c:36: * specified batman interface */ send.c:73: * (which is > 0). This will not be treated as an error. */ send.c:109: * and wait for the tt table request which will be fragmented */ send.c:208: * skb is freed. */ soft-interface.c:178: * requests into the mesh */ soft-interface.c:185: * via unicast to their gateway */ soft-interface.c:216: * this mac is known throughout the mesh */ soft-interface.c:227: * the original skb. */ soft-interface.c:303: * -- Dec 21st 2009, Simon Wunderlich */ translation-table.c:235: * (consistency check) */ translation-table.c:308: * problems */ translation-table.c:392: * response issued before the net ttvn increment (consistency check) */ translation-table.c:853: * the global entry, since it is useless now. */ translation-table.c:1026: * isolation */ translation-table.c:1125: * account while computing the CRC */ translation-table.c:1162: * last OGM (the OGM could carry no changes) */ translation-table.c:1191: * has already been issued for this orig_node, NULL otherwise */ translation-table.c:1301: * copied */ translation-table.c:1324: * reply from the same orig_node yet */ translation-table.c:1430: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1540: * is too big send the whole local translation table */ translation-table.c:1548: * I'll send only one packet with as much TT entries as I can */ translation-table.c:1712: * consistency purpose) */ translation-table.c:1761: * unset the flag */ translation-table.c:1814: * returns true if the ROAMING_ADV can be sent, false otherwise */ translation-table.c:1823: * reply from the same orig_node yet */ translation-table.c:1866: * already roamed to us too many times */ translation-table.c:1938: * in the given hash table and returns the number of modified entries */ translation-table.c:2019: * entries */ translation-table.c:2072: * increased by one -> we can apply the attached changes */ translation-table.c:2077: * In this case send a tt request */ translation-table.c:2088: * in the global table */ translation-table.c:2098: * inconsistency */ translation-table.c:2103: * unset the flag */ translation-table.c:2107: * in sync anymore -> request fresh tt data */ translation-table.c:2125: * purposes */ unicast.c:368: * returns NULL in case of AP isolation */ unicast.c:401: * than the current one */ vis.c:121: * does not already exist in the list */ vis.c:330: * already linked in. */ vis.c:340: * linked in. */ vis.c:384: * is newer than old entries in the hash. */ vis.c:496: * hash.*/ vis.c:550: * Must be called with the originator hash locked */ vis.c:601: * returns 0 on success, -1 if no packet could be generated */ vis.c:699: * held */ vis.c:758: * this node. */ vis.c:874: * initialized (e.g. bat0 is initialized, interfaces have been added) */ bitarray.h:26: * and curr_seqno is within range of last_seqno */ bitarray.h:50: * new, 0 if old */ hash.h:30: * same */ hash.h:35: * argument and the size the second */ hash.h:53: * elements, memory might be leaked. */ hash.h:136: * comparing. */ main.h:43: * -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ main.h:48: * (should be a multiple of our word size) */ main.h:51: * pending tt_req */ main.h:61: * ROAMING_MAX_COUNT times in miliseconds*/ main.h:84: * candidates */ main.h:88: * forw_packet->direct_link_flags */ main.h:252: * - after adding more than 127 to the starting value - it is a successor */ packet.h:92: * 1 << 15 are used for local computation only */ packet.h:153: * as this is assumed by code that handles ICMP packets */ packet.h:209: * - TT_FULL_TABLE */ packet.h:217: * orig_node */ packet.h:222: * if TT_RESPONSE: table_size */ types.h:103: * soon as I receive a new TTVN from this orig_node */ types.h:118: * neigh_node->real_bits, neigh_node->real_packet_count */ types.h:191: * increase my TTVN */ types.h:372: * from. we should not reply to them. */ vis.h:26: * in miliseconds */ Multiline comment starting with empty line master: >>>>>>>> bat_debugfs.c:1:/* bat_iv_ogm.c:1:/* bat_iv_ogm.c:291: /** bat_iv_ogm.c:305: /** bat_iv_ogm.c:456: /** bat_iv_ogm.c:491: /** bat_sysfs.c:1:/* bitarray.c:1:/* bridge_loop_avoidance.c:1:/* bridge_loop_avoidance.c:126:/** bridge_loop_avoidance.c:165:/** bridge_loop_avoidance.c:244:/** bridge_loop_avoidance.c:350:/** bridge_loop_avoidance.c:425:/** bridge_loop_avoidance.c:471:/** bridge_loop_avoidance.c:498:/** bridge_loop_avoidance.c:519:/** bridge_loop_avoidance.c:734:/** bridge_loop_avoidance.c:813:/** bridge_loop_avoidance.c:966:/** bridge_loop_avoidance.c:1014:/** bridge_loop_avoidance.c:1185:/** bridge_loop_avoidance.c:1252:/** bridge_loop_avoidance.c:1293:/** bridge_loop_avoidance.c:1362:/** bridge_loop_avoidance.c:1451:/** compat.c:1:/* distributed-arp-table.c:1:/* gateway_client.c:1:/* gateway_client.c:152: default: /** gateway_client.c:191: /** gateway_client.c:278: /** gateway_client.c:337: /** gateway_client.c:425:/** gateway_common.c:1:/* gateway_common.c:158: /** hard-interface.c:1:/* hard-interface.c:237: /** hard-interface.c:444: /** hash.c:1:/* icmp_socket.c:1:/* main.c:1:/* originator.c:1:/* ring_buffer.c:1:/* routing.c:1:/* routing.c:168: /** routing.c:400: /** send.c:1:/* send.c:89: /** send.c:254: /** send.c:290: /** send.c:300: /** send.c:319: /** send.c:329: /** soft-interface.c:1:/* soft-interface.c:69: /** soft-interface.c:357: /** translation-table.c:1:/* unicast.c:1:/* unicast.c:372: /** vis.c:1:/* bat_algo.h:1:/* bat_debugfs.h:1:/* bat_sysfs.h:1:/* bitarray.h:1:/* bridge_loop_avoidance.h:1:/* compat.h:1:/* distributed-arp-table.h:1:/* gateway_client.h:1:/* gateway_common.h:1:/* hard-interface.h:1:/* hash.h:1:/* hash.h:82:/** icmp_socket.h:1:/* main.h:1:/* main.h:217:/** main.h:228:/** originator.h:1:/* packet.h:1:/* ring_buffer.h:1:/* routing.h:1:/* send.h:1:/* soft-interface.h:1:/* translation-table.h:1:/* types.h:1:/* types.h:63:/** types.h:135:/** types.h:352:/** unicast.h:1:/* vis.h:1:/* Multiline comment starting with empty line next: >>>>>>>> bat_debugfs.c:1:/* bat_iv_ogm.c:1:/* bat_iv_ogm.c:286: /** bat_iv_ogm.c:300: /** bat_iv_ogm.c:451: /** bat_iv_ogm.c:486: /** bat_sysfs.c:1:/* bitarray.c:1:/* bridge_loop_avoidance.c:1:/* bridge_loop_avoidance.c:126:/** bridge_loop_avoidance.c:165:/** bridge_loop_avoidance.c:244:/** bridge_loop_avoidance.c:350:/** bridge_loop_avoidance.c:425:/** bridge_loop_avoidance.c:471:/** bridge_loop_avoidance.c:498:/** bridge_loop_avoidance.c:519:/** bridge_loop_avoidance.c:734:/** bridge_loop_avoidance.c:813:/** bridge_loop_avoidance.c:966:/** bridge_loop_avoidance.c:1014:/** bridge_loop_avoidance.c:1173:/** bridge_loop_avoidance.c:1240:/** bridge_loop_avoidance.c:1281:/** bridge_loop_avoidance.c:1350:/** bridge_loop_avoidance.c:1439:/** compat.c:1:/* distributed-arp-table.c:1:/* gateway_client.c:1:/* gateway_client.c:152: default: /** gateway_client.c:191: /** gateway_client.c:278: /** gateway_client.c:337: /** gateway_client.c:425:/** gateway_common.c:1:/* gateway_common.c:158: /** hard-interface.c:1:/* hard-interface.c:237: /** hard-interface.c:444: /** hash.c:1:/* icmp_socket.c:1:/* main.c:1:/* originator.c:1:/* ring_buffer.c:1:/* routing.c:1:/* routing.c:168: /** routing.c:400: /** send.c:1:/* send.c:142: /** send.c:326: /** send.c:362: /** send.c:372: /** send.c:391: /** send.c:401: /** soft-interface.c:1:/* soft-interface.c:62: /** soft-interface.c:350: /** translation-table.c:1:/* translation-table.c:310: /** unicast.c:1:/* unicast.c:372: /** vis.c:1:/* bat_algo.h:1:/* bat_debugfs.h:1:/* bat_sysfs.h:1:/* bitarray.h:1:/* bridge_loop_avoidance.h:1:/* compat.h:1:/* distributed-arp-table.h:1:/* gateway_client.h:1:/* gateway_common.h:1:/* hard-interface.h:1:/* hash.h:1:/* hash.h:79:/** icmp_socket.h:1:/* main.h:1:/* main.h:216:/** main.h:227:/** originator.h:1:/* packet.h:1:/* ring_buffer.h:1:/* routing.h:1:/* send.h:1:/* soft-interface.h:1:/* translation-table.h:1:/* types.h:1:/* types.h:63:/** types.h:135:/** types.h:329:/** unicast.h:1:/* vis.h:1:/* unused_symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> tt_local_crc wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=n CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> add_bcast_packet_to_list bat_algo_register bat_algo_select bat_algo_seq_print_text bat_event_workqueue bat_iv_init bat_routing_algo bat_socket_init bat_socket_receive_packet bat_socket_setup batman_skb_recv bit_get_packet bonding_candidate_add bonding_candidate_del bonding_save_primary broadcast_addr check_management_packet debugfs_add_meshif debugfs_del_meshif debugfs_destroy debugfs_init dec_module_count find_router frag_list_free frag_reassemble_skb frag_send_skb get_orig_node gw_bandwidth_set gw_bandwidth_to_kbit gw_check_election gw_client_seq_print_text gw_deselect gw_election gw_get_selected_orig gw_is_dhcp_target gw_node_delete gw_node_purge gw_node_update gw_out_of_range handle_tt_response hard_if_notifier hardif_disable_interface hardif_enable_interface hardif_free_rcu hardif_get_by_netdev hardif_list hardif_min_mtu hardif_remove_interfaces hash_destroy hash_new hash_set_lock_class inc_module_count interface_rx is_ap_isolated is_my_client is_my_mac is_wifi_iface mesh_free mesh_init my_skb_head_push neigh_node_free_ref orig_hash_add_if orig_hash_del_if orig_node_free_ref orig_node_get_router orig_seq_print_text originator_free originator_init prepare_unicast_4addr_packet purge_orig_ref purge_outstanding_packets receive_client_update_packet receive_server_sync_packet recv_bcast_packet recv_handler_register recv_handler_unregister recv_icmp_packet recv_roam_adv recv_tt_query recv_ucast_frag_packet recv_unicast_packet recv_vis_packet ring_buffer_avg ring_buffer_set schedule_bat_ogm send_outstanding_bat_ogm_packet send_skb_packet send_tt_response slide_own_bcast_window softif_create softif_destroy softif_is_valid sysfs_add_hardif sysfs_add_meshif sysfs_del_hardif sysfs_del_meshif throw_uevent transtable_search tt_free tt_global_add tt_global_client_is_roaming tt_global_del_orig tt_global_seq_print_text tt_init tt_len tt_local_add tt_local_crc tt_local_remove tt_local_seq_print_text tt_update_orig unicast_generic_send_skb update_min_mtu update_route vis_init vis_quit vis_seq_print_text window_protected wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=n: >>>>>>>> add_bcast_packet_to_list arp_change_timeout bat_algo_register bat_algo_select bat_algo_seq_print_text bat_event_workqueue bat_iv_init bat_routing_algo bat_socket_init bat_socket_receive_packet bat_socket_setup batman_skb_recv bit_get_packet bonding_candidate_add bonding_candidate_del bonding_save_primary broadcast_addr check_management_packet dat_drop_broadcast_packet dat_snoop_incoming_arp_reply dat_snoop_incoming_arp_request dat_snoop_outgoing_arp_reply dat_snoop_outgoing_arp_request debugfs_add_meshif debugfs_del_meshif debugfs_destroy debugfs_init dec_module_count find_router frag_list_free frag_reassemble_skb frag_send_skb get_orig_node gw_bandwidth_set gw_bandwidth_to_kbit gw_check_election gw_client_seq_print_text gw_deselect gw_election gw_get_selected_orig gw_is_dhcp_target gw_node_delete gw_node_purge gw_node_update gw_out_of_range handle_tt_response hard_if_notifier hardif_disable_interface hardif_enable_interface hardif_free_rcu hardif_get_by_netdev hardif_list hardif_min_mtu hardif_remove_interfaces hash_destroy hash_new hash_set_lock_class inc_module_count interface_rx is_ap_isolated is_my_client is_my_mac is_wifi_iface mesh_free mesh_init my_skb_head_push neigh_node_free_ref orig_hash_add_if orig_hash_del_if orig_node_free_ref orig_node_get_router orig_seq_print_text originator_free originator_init prepare_unicast_4addr_packet purge_orig_ref purge_outstanding_packets receive_client_update_packet receive_server_sync_packet recv_bcast_packet recv_handler_register recv_handler_unregister recv_icmp_packet recv_roam_adv recv_tt_query recv_ucast_frag_packet recv_unicast_packet recv_vis_packet ring_buffer_avg ring_buffer_set schedule_bat_ogm send_outstanding_bat_ogm_packet send_skb_packet send_tt_response slide_own_bcast_window softif_create softif_destroy softif_is_valid sysfs_add_hardif sysfs_add_meshif sysfs_del_hardif sysfs_del_meshif throw_uevent transtable_search tt_free tt_global_add tt_global_client_is_roaming tt_global_del_orig tt_global_seq_print_text tt_init tt_len tt_local_add tt_local_crc tt_local_remove tt_local_seq_print_text tt_update_orig unicast_generic_send_skb update_min_mtu update_route vis_init vis_quit vis_seq_print_text window_protected wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=n CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> add_bcast_packet_to_list arp_change_timeout bat_algo_register bat_algo_select bat_algo_seq_print_text bat_event_workqueue bat_iv_init bat_routing_algo bat_socket_init bat_socket_receive_packet bat_socket_setup batman_skb_recv bit_get_packet bonding_candidate_add bonding_candidate_del bonding_save_primary broadcast_addr check_management_packet dat_drop_broadcast_packet dat_snoop_incoming_arp_reply dat_snoop_incoming_arp_request dat_snoop_outgoing_arp_reply dat_snoop_outgoing_arp_request debug_log debugfs_add_meshif debugfs_del_meshif debugfs_destroy debugfs_init dec_module_count find_router frag_list_free frag_reassemble_skb frag_send_skb get_orig_node gw_bandwidth_set gw_bandwidth_to_kbit gw_check_election gw_client_seq_print_text gw_deselect gw_election gw_get_selected_orig gw_is_dhcp_target gw_node_delete gw_node_purge gw_node_update gw_out_of_range handle_tt_response hard_if_notifier hardif_disable_interface hardif_enable_interface hardif_free_rcu hardif_get_by_netdev hardif_list hardif_min_mtu hardif_remove_interfaces hash_destroy hash_new hash_set_lock_class inc_module_count interface_rx is_ap_isolated is_my_client is_my_mac is_wifi_iface mesh_free mesh_init my_skb_head_push neigh_node_free_ref orig_hash_add_if orig_hash_del_if orig_node_free_ref orig_node_get_router orig_seq_print_text originator_free originator_init prepare_unicast_4addr_packet purge_orig_ref purge_outstanding_packets receive_client_update_packet receive_server_sync_packet recv_bcast_packet recv_handler_register recv_handler_unregister recv_icmp_packet recv_roam_adv recv_tt_query recv_ucast_frag_packet recv_unicast_packet recv_vis_packet ring_buffer_avg ring_buffer_set schedule_bat_ogm send_outstanding_bat_ogm_packet send_skb_packet send_tt_response slide_own_bcast_window softif_create softif_destroy softif_is_valid sysfs_add_hardif sysfs_add_meshif sysfs_del_hardif sysfs_del_meshif throw_uevent transtable_search tt_free tt_global_add tt_global_client_is_roaming tt_global_del_orig tt_global_seq_print_text tt_init tt_len tt_local_add tt_local_crc tt_local_remove tt_local_seq_print_text tt_update_orig unicast_generic_send_skb update_min_mtu update_route vis_init vis_quit vis_seq_print_text window_protected wrong namespace symbols master linux-3.3 CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV_BLA=y CONFIG_BATMAN_ADV_DEBUG=y: >>>>>>>> add_bcast_packet_to_list arp_change_timeout bat_algo_register bat_algo_select bat_algo_seq_print_text bat_event_workqueue bat_iv_init bat_routing_algo bat_socket_init bat_socket_receive_packet bat_socket_setup batman_skb_recv bit_get_packet bla_check_bcast_duplist bla_claim_table_seq_print_text bla_free bla_init bla_is_backbone_gw bla_is_backbone_gw_orig bla_rx bla_tx bla_update_orig_address bonding_candidate_add bonding_candidate_del bonding_save_primary broadcast_addr check_management_packet dat_drop_broadcast_packet dat_snoop_incoming_arp_reply dat_snoop_incoming_arp_request dat_snoop_outgoing_arp_reply dat_snoop_outgoing_arp_request debug_log debugfs_add_meshif debugfs_del_meshif debugfs_destroy debugfs_init dec_module_count find_router frag_list_free frag_reassemble_skb frag_send_skb get_orig_node gw_bandwidth_set gw_bandwidth_to_kbit gw_check_election gw_client_seq_print_text gw_deselect gw_election gw_get_selected_orig gw_is_dhcp_target gw_node_delete gw_node_purge gw_node_update gw_out_of_range handle_tt_response hard_if_notifier hardif_disable_interface hardif_enable_interface hardif_free_rcu hardif_get_by_netdev hardif_list hardif_min_mtu hardif_remove_interfaces hash_destroy hash_new hash_set_lock_class inc_module_count interface_rx is_ap_isolated is_my_client is_my_mac is_wifi_iface mesh_free mesh_init my_skb_head_push neigh_node_free_ref orig_hash_add_if orig_hash_del_if orig_node_free_ref orig_node_get_router orig_seq_print_text originator_free originator_init prepare_unicast_4addr_packet purge_orig_ref purge_outstanding_packets receive_client_update_packet receive_server_sync_packet recv_bcast_packet recv_handler_register recv_handler_unregister recv_icmp_packet recv_roam_adv recv_tt_query recv_ucast_frag_packet recv_unicast_packet recv_vis_packet ring_buffer_avg ring_buffer_set schedule_bat_ogm send_outstanding_bat_ogm_packet send_skb_packet send_tt_response slide_own_bcast_window softif_create softif_destroy softif_is_valid sysfs_add_hardif sysfs_add_meshif sysfs_del_hardif sysfs_del_meshif throw_uevent transtable_search tt_free tt_global_add tt_global_client_is_roaming tt_global_del_orig tt_global_seq_print_text tt_init tt_len tt_local_add tt_local_crc tt_local_remove tt_local_seq_print_text tt_update_orig unicast_generic_send_skb update_min_mtu update_route vis_init vis_quit vis_seq_print_text window_protected

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge May 2012