From patchwork Wed Jun 24 12:50:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 4558 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=79.140.42.25; helo=mail.mail.packetmixer.de; envelope-from=sw@simonwunderlich.de; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from mail.mail.packetmixer.de (packetmixer.de [79.140.42.25]) by open-mesh.org (Postfix) with ESMTPS id 94103600E15 for ; Wed, 24 Jun 2015 14:50:24 +0200 (CEST) Received: from kero.packetmixer.de (unknown [IPv6:2a02:3100:2603:f900:221:ccff:fe73:b665]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.mail.packetmixer.de (Postfix) with ESMTPSA id 8E9B8190241; Wed, 24 Jun 2015 14:50:24 +0200 (CEST) From: Simon Wunderlich To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 24 Jun 2015 14:50:20 +0200 Message-Id: <1435150220-25157-2-git-send-email-sw@simonwunderlich.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435150220-25157-1-git-send-email-sw@simonwunderlich.de> References: <1435150220-25157-1-git-send-email-sw@simonwunderlich.de> Cc: Simon Wunderlich Subject: [B.A.T.M.A.N.] [PATCH maint 2/2] batman-adv: remove broadcast packets scheduled for purged outgoing if X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jun 2015 12:50:24 -0000 From: Simon Wunderlich When an interface is purged, the broadcast packets scheduled for this interface should get purged as well. Signed-off-by: Simon Wunderlich --- send.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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);