The following commit has been merged in the next branch: commit 8a463e4c89a56ba388036146181d558f0933e866 Author: Marek Lindner lindner_marek@yahoo.de Date: Thu May 10 12:54:02 2012 +0800

batman-adv: change comment style for David

Should be merged with c9619b5e07a756af43c196874e9e9e91e3251154

Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 2a1845e..96ce556 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1200,7 +1200,8 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, return NET_RX_DROP;

/* did we receive a B.A.T.M.A.N. IV OGM packet on an interface - * that does not have B.A.T.M.A.N. IV enabled ? */ + * that does not have B.A.T.M.A.N. IV enabled ? + */ if (bat_priv->bat_algo_ops->bat_ogm_emit != bat_iv_ogm_emit) return NET_RX_DROP;