The following commit has been merged in the merge/master branch: commit 00b432758ad02ae42137dd414d4346843c4f3b77 Author: Antonio Quartulli ordex@autistici.org Date: Wed Apr 18 09:47:57 2012 +0200

batman-adv: remove duplicated line in comment

Remove an accidentally added duplicated line in a function comment

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index 0359952..8bf9751 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -733,7 +733,6 @@ static int handle_claim(struct bat_priv *bat_priv,

/** * @bat_priv: the bat priv with all the soft interface information - * @bat_priv: the bat priv with all the soft interface information * @hw_src: the Hardware source in the ARP Header * @hw_dst: the Hardware destination in the ARP Header * @ethhdr: pointer to the Ethernet header of the claim frame