[linux-next] LinuxNextTracking branch, master, updated. next-20110624

batman at open-mesh.org batman at open-mesh.org
Fri Jun 24 16:09:32 CEST 2011

The following commit has been merged in the master branch:
commit ca06c6eb9a31ae782e74596231fb23df4fc5e46d
Author: Marek Lindner <lindner_marek at yahoo.de>
Date:   Sat May 14 20:01:22 2011 +0200

    batman-adv: reset broadcast flood protection on error
    The broadcast flood protection should be reset to its original value
    if the primary interface could not be retrieved.
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>
    Signed-off-by: Sven Eckelmann <sven at narfation.org>

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 76daa46..3377927 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -421,7 +421,7 @@ int add_bcast_packet_to_list(struct bat_priv *bat_priv, struct sk_buff *skb)
 	primary_if = primary_if_get_selected(bat_priv);
 	if (!primary_if)
-		goto out;
+		goto out_and_inc;
 	forw_packet = kmalloc(sizeof(struct forw_packet), GFP_ATOMIC);


More information about the linux-merge mailing list