- up to 3.12.0

diff --git a/iproute2-2.2.4-wrr.patch b/iproute2-2.2.4-wrr.patch
index 4a46e8cef8b966c5757eb885006b4eac53aed4ea..989686fecb555935a42a11b96e4fcd2c5dcda224 100644 (file)
--- a/iproute2-2.2.4-wrr.patch
+++ b/iproute2-2.2.4-wrr.patch
@@ -14,8 +14,8 @@ diff -urN iproute-2.6.20-070313-orig/include/linux/pkt_sched.h iproute-2.6.20-07
 --- iproute-2.6.20-070313-orig/include/linux/pkt_sched.h       2007-03-13 22:50:56.000000000 +0100
 +++ iproute-2.6.20-070313/include/linux/pkt_sched.h    2007-04-15 20:52:33.000000000 +0200
 @@ -466,4 +498,116 @@
- 
  #define NETEM_DIST_SCALE      8192
+ #define NETEM_DIST_MAX                16384
  
 +/* WRR section */
 +
@@ -129,7 +129,7 @@ diff -urN iproute-2.6.20-070313-orig/include/linux/pkt_sched.h iproute-2.6.20-07
 +      long changes[0];
 +};
 +
- #endif
+ /* DRR */
 
 diff -urN iproute-2.6.20-070313-orig/tc/q_wrr.c iproute-2.6.20-070313/tc/q_wrr.c
 --- iproute-2.6.20-070313-orig/tc/q_wrr.c      1970-01-01 01:00:00.000000000 +0100

diff --git a/iproute2-htbupstreamfix.patch b/iproute2-htbupstreamfix.patch
deleted file mode 100644 (file)
index e322653..0000000
--- a/iproute2-htbupstreamfix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0a502b21e30be835dcad8d9c6023a41da8709eb1 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Sun, 27 Oct 2013 19:26:47 +0000
-Subject: Fix handling of qdis without options
-
-Some qdisc like htb want the parse_qopt to be called even if no options
-present. Fixes regression caused by:
-
-e9e78b0db0e023035e346ba67de838be851eb665 is the first bad commit
-commit e9e78b0db0e023035e346ba67de838be851eb665
-Author: Stephen Hemminger <stephen@networkplumber.org>
-Date:   Mon Aug 26 08:41:19 2013 -0700
-
-    tc: allow qdisc without options
----
-diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
-index 3002a56..e304858 100644
---- a/tc/tc_qdisc.c
-+++ b/tc/tc_qdisc.c
-@@ -137,15 +137,16 @@ static int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv)
-       if (est.ewma_log)
-               addattr_l(&req.n, sizeof(req), TCA_RATE, &est, sizeof(est));
- 
--      if (argc) {
--              if (q) {
--                      if (!q->parse_qopt) {
--                              fprintf(stderr, "qdisc '%s' does not support option parsing\n", k);
--                              return -1;
--                      }
-+      if (q) {
-+              if (q->parse_qopt) {
-                       if (q->parse_qopt(q, argc, argv, &req.n))
-                               return 1;
--              } else {
-+              } else if (argc) {
-+                      fprintf(stderr, "qdisc '%s' does not support option parsing\n", k);
-+                      return -1;
-+              }
-+      } else {
-+              if (argc) {
-                       if (matches(*argv, "help") == 0)
-                               usage();
- 
---
-cgit v0.9.2
-From 734c0ca2cabf96e2ac1abe6e1b0968d0b5b03b11 Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Sun, 27 Oct 2013 19:28:38 +0000
-Subject: htb: remove old unused duplicate qdisc name
-
-Alexey had htb2 as name for version in ancient code.
----
-diff --git a/tc/q_htb.c b/tc/q_htb.c
-index 6737ddb..e108857 100644
---- a/tc/q_htb.c
-+++ b/tc/q_htb.c
-@@ -346,13 +346,3 @@ struct qdisc_util htb_qdisc_util = {
-       .parse_copt     = htb_parse_class_opt,
-       .print_copt     = htb_print_opt,
- };
--
--/* for testing of old one */
--struct qdisc_util htb2_qdisc_util = {
--      .id             =  "htb2",
--      .parse_qopt     = htb_parse_opt,
--      .print_qopt     = htb_print_opt,
--      .print_xstats   = htb_print_xstats,
--      .parse_copt     = htb_parse_class_opt,
--      .print_copt     = htb_print_opt,
--};
---
-cgit v0.9.2

diff --git a/iproute2.spec b/iproute2.spec
index 54aeed0994512b4d29a723dd6bbce41cddfa3322..7729a4b045d2115404441eac041a9444e819a50b 100644 (file)
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -18,17 +18,16 @@ Summary(es.UTF-8):  Herramientas para encaminamiento avanzado y configuración de
 Summary(pl.UTF-8):     Narzędzie do konfigurowania sieci
 Summary(pt_BR.UTF-8):  Ferramentas para roteamento avançado e configuração de interfaces de rede
 Name:          iproute2
-Version:       3.11.0
-Release:       2
+Version:       3.12.0
+Release:       1
 License:       GPL v2+
 Group:         Networking/Admin
 Source0:       https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5: d7ffb27bc9f0d80577b1f3fb9d1a7689
+# Source0-md5: f87386aaaecafab95607fd10e8152c68
 Patch0:                %{name}-arp.patch
 Patch1:                %{name}-iptables.patch
 Patch2:                %{name}-iptables64.patch
 Patch3:                %{name}-LDFLAGS.patch
-Patch4:                %{name}-htbupstreamfix.patch
 # extensions
 Patch10:       %{name}-2.2.4-wrr.patch
 Patch11:       esfq-%{name}.patch
@@ -125,7 +124,6 @@ Dokumentacja do iproute zawiera "howto" oraz przykłady ustawień.
 %patch1 -p1
 %endif
 %patch3 -p1
-%patch4 -p1
 # extensions:
 %patch10 -p1
 %patch11 -p1