rpms/iproute/devel iproute2-tc-priority.patch, NONE, 1.1 iproute.spec, 1.109, 1.110 man-pages.patch, 1.4, 1.5 iproute2-6rd-tunnel.patch, 1.1, NONE

[Petr Sabata]

Author: psabata

Update of /cvs/pkgs/rpms/iproute/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26215

Modified Files:
	iproute.spec man-pages.patch 
Added Files:
	iproute2-tc-priority.patch 
Removed Files:
	iproute2-6rd-tunnel.patch 
Log Message:
* Mon Jun 21 2010 Petr Sabata <psabata at redhat.com> - 2.6.34-2
- iproute-tc-priority.patch, rhbz#586112


iproute2-tc-priority.patch:
 f_u32.c |   39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

--- NEW FILE iproute2-tc-priority.patch ---
diff --git a/tc/f_u32.c b/tc/f_u32.c
index 4f5f74e..290595c 100644
--- a/tc/f_u32.c
+++ b/tc/f_u32.c
@@ -403,6 +403,43 @@ static int parse_ip6_addr(int *argc_p, char ***argv_p,
 	return res;
 }
 
+static int parse_ip6_class(int *argc_p, char ***argv_p, struct tc_u32_sel *sel)
+{
+	int res = -1;
+	int argc = *argc_p;
+	char **argv = *argv_p;
+	__u32 key;
+	__u32 mask;
+	int offmask = 0;
+
+	if (argc < 2)
+		return -1;
+
+	if (get_u32(&key, *argv, 0))
+		return -1;
+	argc--; argv++;
+
+	if (get_u32(&mask, *argv, 16))
+		return -1;
+	argc--; argv++;
+
+	if (key > 0xFF || mask > 0xFF)
+		return -1;
+
+	key <<= 20;
+	mask <<= 20;
+	key = htonl(key);
+	mask = htonl(mask);
+
+	if (res = pack_key(sel, key, mask, 0, offmask) < 0)
+		return -1;
+	res = 0;
+
+	*argc_p = argc;
+	*argv_p = argv;
+	return res;
+}
+
 static int parse_ether_addr(int *argc_p, char ***argv_p,
 			    struct tc_u32_sel *sel, int off)
 {
@@ -522,7 +559,7 @@ static int parse_ip6(int *argc_p, char ***argv_p, struct tc_u32_sel *sel)
 		res = parse_ip6_addr(&argc, &argv, sel, 24);
 	} else if (strcmp(*argv, "priority") == 0) {
 		NEXT_ARG();
-		res = parse_u8(&argc, &argv, sel, 4, 0);
+		res = parse_ip6_class(&argc, &argv, sel);
 	} else if (strcmp(*argv, "protocol") == 0) {
 		NEXT_ARG();
 		res = parse_u8(&argc, &argv, sel, 6, 0);


Index: iproute.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/iproute.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- iproute.spec	21 Jun 2010 13:14:50 -0000	1.109
+++ iproute.spec	21 Jun 2010 13:54:30 -0000	1.110
@@ -4,12 +4,12 @@
 Summary: Advanced IP routing and network device configuration tools
 Name: iproute
 Version: 2.6.34
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/System
 ##Source: iproute2-%{date_version}.tar.bz2
 Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
 URL:    http://linux-net.osdl.org/index.php/Iproute2
-##Patch0: man-pages.patch
+Patch0: man-pages.patch
 Patch1: iproute2-2.6.29-kernel.patch
 Patch2: iproute2-ss050901-opt_flags.patch
 Patch3: iproute2-2.6.25-segfault.patch
@@ -17,7 +17,7 @@ Patch4: iproute2-sharepath.patch
 Patch5: iproute2-2.6.31-tc_modules.patch
 Patch6: iproute2-2.6.29-IPPROTO_IP_for_SA.patch
 Patch7: iproute2-example-cbq-service.patch
-#Patch8: iproute2-6rd-tunnel.patch
+Patch8: iproute2-tc-priority.patch
 
 License: GPLv2+ and Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +41,7 @@ The iproute documentation contains howto
 
 %prep
 %setup -q -n iproute2-%{version}
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1 -b .kernel
 %patch2 -p1 -b .opt_flags
 %patch3 -p1 -b .seg
@@ -49,7 +49,7 @@ The iproute documentation contains howto
 %patch5 -p1 -b .ipt
 %patch6 -p1 -b .ipproto
 %patch7 -p1 -b .fix_cbq
-#patch8 -p1 -b .tunnel
+%patch8 -p1 -b .tc_priority
 
 %build
 export LIBDIR=/%{_libdir}
@@ -128,6 +128,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Mon Jun 21 2010 Petr Sabata <psabata at redhat.com> - 2.6.34-2
+- iproute-tc-priority.patch, rhbz#586112
+
 * Mon Jun 21 2010 Petr Sabata <psabata at redhat.com> - 2.6.34-1
 - 2.6.34 version bump
 

man-pages.patch:
 cbq.8   |    1 +
 ifcfg.8 |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ip.8    |    2 ++
 nstat.8 |    1 +
 4 files changed, 61 insertions(+)

Index: man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iproute/devel/man-pages.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- man-pages.patch	24 May 2010 12:45:55 -0000	1.4
+++ man-pages.patch	21 Jun 2010 13:54:30 -0000	1.5
@@ -83,15 +83,3 @@ diff -up iproute2-2.6.29/iproute2-2.6.29
  .B  ssthresh
  .IR REALM " ] [ "
  .B  realms
-@@ -1480,6 +1482,11 @@ the clamp for congestion window.  It is 
- flag is not used.
- 
- .TP
-+.BI initcwnd " NUMBER "
-+the maximum initial congestion window (cwnd) size in MSS of a
-+TCP connection.
-+
-+.TP
- .BI advmss " NUMBER " "(2.3.15+ only)"
- the MSS ('Maximal Segment Size') to advertise to these
- destinations when establishing TCP connections.  If it is not given,


--- iproute2-6rd-tunnel.patch DELETED ---