batman-adv: Fix broadcast/ogm queue limit on a removed interface

T-X · ordex · commit c4fdb6cff2aa · 2016-04-24T15:41:56.000+08:00
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: 6d5808d ("batman-adv: Add missing hardif_free_ref in forw_packet_free") Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> [sven@narfation.org: fix conflicts with current version] Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch> Signed-off-by: Antonio Quartulli <a@unstable.cc>
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
@@ -675,6 +675,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);
 		}
 	}
@@ -702,6 +705,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);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,`
`675`	`675`
`676`	`676`	`if (pending) {`
`677`	`677`	`hlist_del(&forw_packet->list);`
	`678`	`+ if (!forw_packet->own)`
	`679`	`+ atomic_inc(&bat_priv->bcast_queue_left);`
	`680`	`+`
`678`	`681`	`batadv_forw_packet_free(forw_packet);`
`679`	`682`	`}`
`680`	`683`	`}`
`@@ -702,6 +705,9 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv,`
`702`	`705`
`703`	`706`	`if (pending) {`
`704`	`707`	`hlist_del(&forw_packet->list);`
	`708`	`+ if (!forw_packet->own)`
	`709`	`+ atomic_inc(&bat_priv->batman_queue_left);`
	`710`	`+`
`705`	`711`	`batadv_forw_packet_free(forw_packet);`
`706`	`712`	`}`
`707`	`713`	`}`