batman-adv: remove broadcast packets scheduled for purged outgoing if
authorSimon Wunderlich <simon@open-mesh.com>
Wed, 24 Jun 2015 12:50:20 +0000 (14:50 +0200)
committerAntonio Quartulli <antonio@meshcoding.com>
Fri, 14 Aug 2015 20:52:09 +0000 (22:52 +0200)
When an interface is purged, the broadcast packets scheduled for this
interface should get purged as well.

Signed-off-by: Simon Wunderlich <simon@open-mesh.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
net/batman-adv/send.c

index 0a01992e65ab06b898e40a8097a29e5162c53b08..191076ef1eca1d0a6a2833d4437f925da1b9e71b 100644 (file)
@@ -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);