The following commit has been merged in the merge/master branch: commit ef30ba92e5bba3a1c63f837814b6bcb28559d315 Author: Simon Wunderlich simon.wunderlich@open-mesh.com Date: Fri Feb 12 11:35:35 2016 +0100

batman-adv: fix logic error in batadv_v_ogm_forward

The latest restructure attempt of the B.A.T.M.A.N. V forward function introduced a regression, causing kernel crashes when an OGM is forwarded. This patch fixes it.

Fixes: 30c96bc787 ("batman-adv: move and restructure batadv_v_ogm_forward") Reported-by: Sven Eckelmann sven.eckelmann@open-mesh.com Signed-off-by: Simon Wunderlich simon.wunderlich@open-mesh.com Tested-by: Sven Eckelmann sven.eckelmann@open-mesh.com Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 1b2399e..4155fa5 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -309,7 +309,7 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, u16 tvlv_len;

/* only forward for specific interfaces, not for the default one. */ - if (if_outgoing != BATADV_IF_DEFAULT) + if (if_outgoing == BATADV_IF_DEFAULT) goto out;

orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing);