Re: Patch "batman-adv: Fix broadcast/ogm queue limit on a removed interface" has been added to the 3.14-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Sat, May 07, 2016 at 12:40:12AM -0400, Greg KH wrote:
> On Fri, May 06, 2016 at 10:03:50PM +0200, Sven Eckelmann wrote:
> > On Friday 06 May 2016 14:36:56 gregkh@linuxfoundation.org wrote:
> > [...]
> > > The filename of the patch is:
> > >      batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch
> > > and it can be found in the queue-3.14 subdirectory.
> > [...]
> > > --- a/net/batman-adv/send.c
> > > +++ b/net/batman-adv/send.c
> > > @@ -637,6 +637,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);
> > >  		}
> > >  	}
> > > 
> > 
> > This looks odd. Why is this commit doing the inc twice in the same place? 
> > Looks different than the origin patch (which does it for two different 
> > places):
> > 
> > https://patchwork.open-mesh.org/patch/15974/
> > 
> > Same for the 4.4 and 4.5 stable changes. I've cherry-picked the commit for 
> > 3.14 and my results look like this (not even compile tested):
> > 
> > --- a/net/batman-adv/send.c
> > +++ b/net/batman-adv/send.c
> > @@ -610,6 +610,9 @@ batadv_purge_outstanding_packets(struct batadv_priv 
> > *bat_priv,
> >  
> >  		if (pending) {
> >  			hlist_del(&forw_packet->list);
> > +			if (!forw_packet->own)
> > +				atomic_inc(&bat_priv->bcast_queue_left);
> > +
> >  			batadv_forw_packet_free(forw_packet);
> >  		}
> >  	}
> > @@ -637,6 +640,9 @@ batadv_purge_outstanding_packets(struct batadv_priv 
> > *bat_priv,
> >  
> >  		if (pending) {
> >  			hlist_del(&forw_packet->list);
> > +			if (!forw_packet->own)
> > +				atomic_inc(&bat_priv->batman_queue_left);
> > +
> >  			batadv_forw_packet_free(forw_packet);
> >  		}
> >  	}
> > 
> 
> Oh that's really odd, thanks for letting me know.  Let me try to figure
> out what went wrong...

This looks like a bug in patch.  Git creates the correct patch, but when
patch imports it, it messes it up and creates the version you saw.

I hand edited the file after it was patched to fix this up.

If I get a chance I'll go file a bug with the patch developers.

thanks,

greg k-h