The following commit has been merged in the merge/master branch: commit 6fd9fab17dcf6b636e0a005d21edb2135d8c3b20 Author: Antonio Quartulli ordex@autistici.org Date: Wed Aug 22 00:42:40 2012 +0200
batman-adv: move function arguments on one line
Signed-off-by: Antonio Quartulli ordex@autistici.org
diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h index e04a8fe..789cb73 100644 --- a/net/batman-adv/bridge_loop_avoidance.h +++ b/net/batman-adv/bridge_loop_avoidance.h @@ -43,8 +43,7 @@ void batadv_bla_free(struct batadv_priv *bat_priv); #else /* ifdef CONFIG_BATMAN_ADV_BLA */
static inline int batadv_bla_rx(struct batadv_priv *bat_priv, - struct sk_buff *skb, short vid, - bool is_bcast) + struct sk_buff *skb, short vid, bool is_bcast) { return 0; }