Thread (127 messages) 127 messages, 5 authors, 2016-06-14

Re: [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface

From: Sven Eckelmann <sven@narfation.org>
Date: 2016-06-13 19:33:58
Also in: lkml

Hi,

looks like the patch is broken (at least it does something different than the 
non-stable patch does).

On Monday 13 June 2016 19:36:37 Ben Hutchings wrote:
3.16.36-rc1 review patch.  If anyone has any objections, please let me know.
[...]
quoted hunk ↗ jump to hunk
--- 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);
 		}
 	}
It seems to be a problem with the way GNU patch solved the conflicts with the 
slightly different orig file (moved the hunks together when it shouldn't 
have). GregKH also had this problem [1]

Kind regards,
	Sven

[1] http://mid.gmane.org/20160507195405.GA4376@kroah.com

Attachments

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help