From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965136AbcFMTf7 (ORCPT ); Mon, 13 Jun 2016 15:35:59 -0400 Received: from mail.aperture-lab.de ([138.201.29.205]:33355 "EHLO mail.aperture-lab.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965047AbcFMTf5 (ORCPT ); Mon, 13 Jun 2016 15:35:57 -0400 X-Greylist: delayed 548 seconds by postgrey-1.27 at vger.kernel.org; Mon, 13 Jun 2016 15:35:56 EDT Date: Mon, 13 Jun 2016 21:26:43 +0200 From: Linus =?utf-8?Q?L=C3=BCssing?= To: Ben Hutchings Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, akpm@linux-foundation.org, b.a.t.m.a.n@lists.open-mesh.org, Marek Lindner , Antonio Quartulli , Sven Eckelmann Subject: Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface Message-ID: <20160613192643.GJ3293@otheros> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 13, 2016 at 07:36:37PM +0100, Ben Hutchings wrote: > 3.16.36-rc1 review patch. If anyone has any objections, please let me know. > Hi Ben, This one looks weird. The version you added for 3.2.81-rc1 looked better. Cheers, Linus > ------------------ > > From: Linus Lüssing > > commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream. > > When removing a single interface while a broadcast or ogm packet is > still pending then we will free the forward packet without releasing the > queue slots again. > > This patch is supposed to fix this issue. > > Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free") > Signed-off-by: Linus Lüssing > [sven@narfation.org: fix conflicts with current version] > Signed-off-by: Sven Eckelmann > Signed-off-by: Marek Lindner > Signed-off-by: Antonio Quartulli > Signed-off-by: Ben Hutchings > --- > net/batman-adv/send.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > --- a/net/batman-adv/send.c > +++ b/net/batman-adv/send.c > @@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct > > if (pending) { > hlist_del(&forw_packet->list); > + if (!forw_packet->own) > + atomic_inc(&bat_priv->bcast_queue_left); > + > + if (!forw_packet->own) > + atomic_inc(&bat_priv->batman_queue_left); > + > batadv_forw_packet_free(forw_packet); > } > } >