From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 20 Mar 2012 06:11:33 +0000 (+0000)
Subject: - up to 3.3.0
X-Git-Tag: auto/th/iproute2-3_3_0-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=dbc3e231d0572ad7650d7c81164788ef1acf00f3;p=packages%2Fiproute2.git

- up to 3.3.0

Changed files:
    esfq-iproute2.patch -> 1.4
    iproute2-build.patch -> 1.14
    iproute2.spec -> 1.215
---

diff --git a/esfq-iproute2.patch b/esfq-iproute2.patch
index ba33128..76fada5 100644
--- a/esfq-iproute2.patch
+++ b/esfq-iproute2.patch
@@ -1,13 +1,9 @@
 diff -Naur iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h iproute2-2.6.19-061214/include/linux/pkt_sched.h
 --- iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h	2006-12-14 15:04:12.000000000 -0800
 +++ iproute2-2.6.19-061214/include/linux/pkt_sched.h	2007-02-13 23:18:29.000000000 -0800
-@@ -146,8 +146,40 @@
-  *
-  *	The only reason for this is efficiency, it is possible
-  *	to change these parameters in compile time.
-+ *
-+ *	If you need to play with these values use esfq instead.
-  */
+@@ -193,6 +193,36 @@ struct tc_sfq_xstats {
+ 	__s32		allot;
+ };
  
 +/* ESFQ section */
 +
@@ -31,17 +27,17 @@ diff -Naur iproute2-2.6.19-061214.orig/include/linux/pkt_sched.h iproute2-2.6.19
 +
 +struct tc_esfq_qopt
 +{
-+	unsigned	quantum;	/* Bytes per round allocated to flow */
-+	int		perturb_period;	/* Period of hash perturbation */
-+	__u32		limit;		/* Maximal packets in queue */
-+	unsigned	divisor;	/* Hash divisor  */
-+	unsigned	flows;		/* Maximal number of flows  */
++	unsigned        quantum;        /* Bytes per round allocated to flow */
++	int             perturb_period; /* Period of hash perturbation */
++	__u32           limit;          /* Maximal packets in queue */
++	unsigned        divisor;        /* Hash divisor  */
++	unsigned        flows;          /* Maximal number of flows  */
 +	unsigned        hash_kind;      /* Hash function to use for flow identification */
 +};
 +
  /* RED section */
  
- enum
+ enum {
 diff -Naur iproute2-2.6.19-061214.orig/tc/Makefile iproute2-2.6.19-061214/tc/Makefile
 --- iproute2-2.6.19-061214.orig/tc/Makefile	2006-12-14 15:04:12.000000000 -0800
 +++ iproute2-2.6.19-061214/tc/Makefile	2007-02-11 11:56:13.000000000 -0800
diff --git a/iproute2-build.patch b/iproute2-build.patch
index 8e027a3..4dc942b 100644
--- a/iproute2-build.patch
+++ b/iproute2-build.patch
@@ -1,33 +1,3 @@
-diff -urNbB iproute2-2.6.14-051107.org/configure iproute2-2.6.14-051107/configure
---- iproute2-2.6.14-051107.org/configure	2005-01-18 00:26:46.000000000 +0100
-+++ iproute2-2.6.14-051107/configure	2005-11-10 16:04:15.024922750 +0100
-@@ -5,7 +5,7 @@
- 
- function check_atm
- {
--cat >/tmp/atmtest.c <<EOF
-+cat >atmtest.c <<EOF
- #include <atm.h>
- int main(int argc, char **argv) {
- 	struct atm_qos qos;
-@@ -16,7 +16,7 @@
- 	return 0;
- }
- EOF
--gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 
-+gcc -I$INCLUDE -o atmtest atmtest.c -latm >/dev/null 2>&1 
- if [ $? -eq 0 ]
- then
-     echo "TC_CONFIG_ATM:=y" >>Config
-@@ -21,7 +21,7 @@
- else
-     echo no
- fi
--rm -f /tmp/atmtest.c /tmp/atmtest
-+rm -f atmtest*
- }
- 
- function check_xt
 diff -urNbB iproute2-2.6.14-051107.org/Makefile iproute2-2.6.14-051107/Makefile
 --- iproute2-2.6.14-051107.org/Makefile	2005-07-09 00:08:47.000000000 +0200
 +++ iproute2-2.6.14-051107/Makefile	2005-11-10 16:04:15.024922750 +0100
diff --git a/iproute2.spec b/iproute2.spec
index b3c359c..e358a9d 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -15,12 +15,12 @@ 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.2.0
+Version:	3.3.0
 Release:	1
 License:	GPL v2+
 Group:		Networking/Admin
 Source0:	http://kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz
-# Source0-md5:	6f814291cc3d7f4312cf8c2c052da5f1
+# Source0-md5:	39a7ff2c5149475c710365954e2ce49b
 Patch0:		%{name}-build.patch
 Patch1:		%{name}-arp.patch
 Patch3:		%{name}-iptables.patch