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 5c20a7ca25c3d524ad2b315ac01c8f584b820284..031aa06da666aefcc92b58c6a616167ef29cfa90 100644 (file)
--- 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?= <linus.luessing@c0d3.blue>
+From: Linus Lüssing <linus.luessing@c0d3.blue>
 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 <gregkh@linuxfoundation.org>
 
 --- 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 de88291559e0ad6f18a4b3ce322e67fcbfa5d0e9..c6703db74c818b295f33b551dce1fb632dbecd4a 100644 (file)
--- 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?= <linus.luessing@c0d3.blue>
+From: Linus Lüssing <linus.luessing@c0d3.blue>
 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 <gregkh@linuxfoundation.org>
 
 --- 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 beed2803563ab410e32ee306c26a048ff4730a27..61bd0bb20f78656498435cbaa03fcb3b5ecca251 100644 (file)
--- 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?= <linus.luessing@c0d3.blue>
+From: Linus Lüssing <linus.luessing@c0d3.blue>
 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 <gregkh@linuxfoundation.org>
 
 --- 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);
 +