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

batman at open-mesh.org batman at open-mesh.org
Wed Aug 19 00:15:54 CEST 2015


The following commit has been merged in the master branch:
commit 3f1e08d0ae6746379b9e21264dae52f4f35c7ad2
Author: Simon Wunderlich <simon at open-mesh.com>
Date:   Wed Jun 24 14:50:20 2015 +0200

    batman-adv: remove broadcast packets scheduled for purged outgoing if
    
    When an interface is purged, the broadcast packets scheduled for this
    interface should get purged as well.
    
    Signed-off-by: Simon Wunderlich <simon at open-mesh.com>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 0a01992..191076e 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -616,7 +616,8 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,
 		 * we delete only packets belonging to the given interface
 		 */
 		if ((hard_iface) &&
-		    (forw_packet->if_incoming != hard_iface))
+		    (forw_packet->if_incoming != hard_iface) &&
+		    (forw_packet->if_outgoing != hard_iface))
 			continue;
 
 		spin_unlock_bh(&bat_priv->forw_bcast_list_lock);

-- 
LinuxNextTracking


More information about the linux-merge mailing list