Update to 4.15, fix /bin/ss with no header flag

[iproute2.git] / debian / patches / 0006-police-don-t-skip-parameters-after-actions.patch

diff --git a/debian/patches/0006-police-don-t-skip-parameters-after-actions.patch b/debian/patches/0006-police-don-t-skip-parameters-after-actions.patch
deleted file mode 100644 (file)
index 0a0f2c3..0000000
--- a/debian/patches/0006-police-don-t-skip-parameters-after-actions.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Mon, 29 Jan 2018 11:50:55 +0100
-Subject: [PATCH iproute2] police: don't skip parameters after actions
-
-The 'parse_action_control()' helper advances the argument
-pointers to past its parsed action already, so don't
-advance it further in 'act_parse_polic()'.
-
-Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions")
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
----
- tc/m_police.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tc/m_police.c b/tc/m_police.c
-index ff1dcb7d..f0878b3a 100644
---- a/tc/m_police.c
-+++ b/tc/m_police.c
-@@ -154,6 +154,7 @@ int act_parse_police(struct action_util *a, int *argc_p, char ***argv_p,
-                          matches(*argv, "goto") == 0) {
-                       if (parse_action_control(&argc, &argv, &p.action, false))
-                               return -1;
-+                      goto keep_arg;
-               } else if (strcmp(*argv, "conform-exceed") == 0) {
-                       NEXT_ARG();
-                       if (parse_action_control_slash(&argc, &argv, &p.action,
-@@ -174,8 +175,9 @@ int act_parse_police(struct action_util *a, int *argc_p, char ***argv_p,
-               } else {
-                       break;
-               }
--              ok++;
-               argc--; argv++;
-+keep_arg:
-+              ok++;
-       }
- 
-       if (!ok)
--- 
-2.11.0
-