From: Greg Kroah-Hartman Date: Sat, 7 May 2016 19:56:11 +0000 (+0200) Subject: fix batman patch that patch messed up. X-Git-Tag: v3.14.69~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=241311a061a89c2d37f629b1cb9160e8c2c53bc9;p=thirdparty%2Fkernel%2Fstable-queue.git fix batman patch that patch messed up. --- diff --git a/queue-3.14/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch b/queue-3.14/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch index 5c20a7ca25c..031aa06da66 100644 --- a/queue-3.14/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch +++ b/queue-3.14/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch @@ -1,5 +1,5 @@ From c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Linus=20L=C3=BCssing?= +From: Linus Lüssing Date: Fri, 11 Mar 2016 14:04:49 +0100 Subject: batman-adv: Fix broadcast/ogm queue limit on a removed interface MIME-Version: 1.0 @@ -30,13 +30,20 @@ Signed-off-by: Greg Kroah-Hartman --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c -@@ -637,6 +637,12 @@ batadv_purge_outstanding_packets(struct +@@ -610,6 +610,9 @@ batadv_purge_outstanding_packets(struct 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 + + if (pending) { + hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + diff --git a/queue-4.4/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch b/queue-4.4/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch index de88291559e..c6703db74c8 100644 --- a/queue-4.4/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch +++ b/queue-4.4/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch @@ -1,5 +1,5 @@ From c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Linus=20L=C3=BCssing?= +From: Linus Lüssing Date: Fri, 11 Mar 2016 14:04:49 +0100 Subject: batman-adv: Fix broadcast/ogm queue limit on a removed interface MIME-Version: 1.0 @@ -30,13 +30,20 @@ Signed-off-by: Greg Kroah-Hartman --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c -@@ -657,6 +657,12 @@ batadv_purge_outstanding_packets(struct +@@ -630,6 +630,9 @@ batadv_purge_outstanding_packets(struct if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + + batadv_forw_packet_free(forw_packet); + } + } +@@ -657,6 +660,9 @@ batadv_purge_outstanding_packets(struct + + if (pending) { + hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); + diff --git a/queue-4.5/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch b/queue-4.5/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch index beed2803563..61bd0bb20f7 100644 --- a/queue-4.5/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch +++ b/queue-4.5/batman-adv-fix-broadcast-ogm-queue-limit-on-a-removed-interface.patch @@ -1,5 +1,5 @@ From c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Linus=20L=C3=BCssing?= +From: Linus Lüssing Date: Fri, 11 Mar 2016 14:04:49 +0100 Subject: batman-adv: Fix broadcast/ogm queue limit on a removed interface MIME-Version: 1.0 @@ -30,13 +30,20 @@ Signed-off-by: Greg Kroah-Hartman --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c -@@ -656,6 +656,12 @@ batadv_purge_outstanding_packets(struct +@@ -629,6 +629,9 @@ batadv_purge_outstanding_packets(struct if (pending) { hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->bcast_queue_left); + + batadv_forw_packet_free(forw_packet); + } + } +@@ -656,6 +659,9 @@ batadv_purge_outstanding_packets(struct + + if (pending) { + hlist_del(&forw_packet->list); + if (!forw_packet->own) + atomic_inc(&bat_priv->batman_queue_left); +