The following commit has been merged in the master branch: commit 69497c17c6ffc636e463d528c2f4c87e4d894964 Author: Antonio Quartulli ordex@autistici.org Date: Fri Dec 2 17:38:52 2011 +0100

batman-adv: format multi-line if in the correct way

in an multi-line if statement leading edges should line up to the opening parenthesis

Reported-by: David Miller davem@davemloft.net Signed-off-by: Antonio Quartulli ordex@autistici.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index ef24a72..773e606 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -627,8 +627,7 @@ int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)

/* Ensure we have all the claimed data */ if (unlikely(skb_headlen(skb) < - sizeof(struct tt_query_packet) + - tt_len)) + sizeof(struct tt_query_packet) + tt_len)) goto out;

handle_tt_response(bat_priv, tt_query);