[linux-next] LinuxNextTracking branch, master, updated. next-20130531

batman at open-mesh.org batman at open-mesh.org
Sat Jun 1 00:18:27 CEST 2013

The following commit has been merged in the master branch:
commit 38dc40ef52d882e08b2af71fc1b5413ac7009952
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Sat Mar 30 17:22:00 2013 +0100

    batman-adv: do not silently ignore wrong condition
    Only one neigh_node per orig_node should match a given
    neighbor address, therefore, if more than one matching
    neigh_node is found, a WARNING has to be triggered to let
    the user know that something is wrong in the originator
    state instead of silently skipping the error.
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 38183dc..bd50e0d 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -669,7 +669,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv,
 		if (batadv_compare_eth(neigh_addr, ethhdr->h_source) &&
 		    tmp_neigh_node->if_incoming == if_incoming &&
 		    atomic_inc_not_zero(&tmp_neigh_node->refcount)) {
-			if (neigh_node)
+			if (WARN(neigh_node, "too many matching neigh_nodes"))
 			neigh_node = tmp_neigh_node;


More information about the linux-merge mailing list