diff mbox

[maint,2/2] batman-adv: remove broadcast packets scheduled for purged outgoing if

Message ID 1435150220-25157-2-git-send-email-sw@simonwunderlich.de (mailing list archive)
State Accepted, archived
Commit 07bec2d4dec83f024baf166b95cf037be3a7eca5
Headers

Commit Message

Simon Wunderlich June 24, 2015, 12:50 p.m. UTC 
  From: Simon Wunderlich <simon@open-mesh.com>

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>
---
 send.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Marek Lindner June 28, 2015, 1:58 p.m. UTC | #1 
On Wednesday, June 24, 2015 14:50:20 Simon Wunderlich wrote:
> From: Simon Wunderlich <simon@open-mesh.com>
> 
> 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>
> ---
>  send.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied in revision 07bec2d.

Thanks,
Marek
diff mbox

Patch

diff --git a/send.c b/send.c
index 23635bd..a7e84b2 100644
--- a/send.c
+++ b/send.c
@@ -598,7 +598,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);