[iproute/f14] Include cb4bd0ec8 (#707984)

[Petr Sabata]

commit b1ef34f67eb78c900023b299a2c4b01d46d7f8f8
Author: Petr Sabata <contyk at redhat.com>
Date:   Wed Jun 1 12:00:31 2011 +0200

    Include cb4bd0ec8 (#707984)

 iproute.spec                                    |    7 +++-
 iproute2-2.6.33-fix-gred-options-clearing.patch |   40 +++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/iproute.spec b/iproute.spec
index e93437a..d4261f0 100644
--- a/iproute.spec
+++ b/iproute.spec
@@ -4,7 +4,7 @@
 Summary:    Advanced IP routing and network device configuration tools
 Name:       iproute
 Version:    2.6.35
-Release:    6%{?dist}
+Release:    9%{?dist}
 Group:      Applications/System
 ##Source: iproute2-%{date_version}.tar.bz2
 Source:     http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Patch7:     iproute2-example-cbq-service.patch
 Patch8:     iproute2-2.6.35-print-route.patch
 Patch9:     iproute2-print-route-u32.patch
 Patch10:    iproute2-2.6.33-create-peer-veth-without-a-name.patch
+Patch11:    iproute2-2.6.33-fix-gred-options-clearing.patch
 
 License:    GPLv2+ and Public Domain
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,7 @@ sed -i "s/_VERSION_/%{version}/" man/man8/ss.8
 %patch8 -p1 -b .print-route
 %patch9 -p1 -b .print-route-u32
 %patch10 -p1 -b .peer-veth-without-name
+%patch11 -p1 -b .fix-gred-options-clearing
 
 %build
 export LIBDIR=/%{_libdir}
@@ -136,6 +138,9 @@ EOF
 %doc RELNOTES
 
 %changelog
+* Wed Jun 01 2011 Petr Sabata <contyk at redhat.com> - 2.6.35-9
+- Include cb4bd0ec8 (#707984)
+
 * Tue Nov 09 2010 Petr Sabata <psabata at redhat.com> - 2.6.35-8
 - rhbz#641599, use the versioned path, man-pages.patch update, prep update
 
diff --git a/iproute2-2.6.33-fix-gred-options-clearing.patch b/iproute2-2.6.33-fix-gred-options-clearing.patch
new file mode 100644
index 0000000..3e9e2af
--- /dev/null
+++ b/iproute2-2.6.33-fix-gred-options-clearing.patch
@@ -0,0 +1,40 @@
+commit cb4bd0ec8dcba856d1ebf8b3f72b79f669dad0f4
+Author: Stephen Hemminger <stephen.hemminger at vyatta.com>
+Date:   Wed Aug 25 09:04:55 2010 -0700
+
+    Fix GRED options clearing
+    
+    Bug reported where priorities of GRED DP's are ignored.
+    The option parsing sets opt then memset was clearing these
+    values.
+
+diff --git a/tc/q_gred.c b/tc/q_gred.c
+index df4aa3d..59651d3 100644
+--- a/tc/q_gred.c
++++ b/tc/q_gred.c
+@@ -51,7 +51,7 @@ static int init_gred(struct qdisc_util *qu, int argc, char **argv,
+ {
+ 
+ 	struct rtattr *tail;
+-	struct tc_gred_sopt opt;
++	struct tc_gred_sopt opt = { 0 };
+ 	int dps = 0;
+ 	int def_dp = -1;
+ 
+@@ -83,7 +83,7 @@ static int init_gred(struct qdisc_util *qu, int argc, char **argv,
+ 				return -1;
+ 			}
+ 		} else if (strcmp(*argv, "grio") == 0) {
+-			opt.grio=1;
++			opt.grio = 1;
+ 		} else if (strcmp(*argv, "help") == 0) {
+ 			explain();
+ 			return -1;
+@@ -100,7 +100,6 @@ static int init_gred(struct qdisc_util *qu, int argc, char **argv,
+ 		return -1;
+ 	}
+ 
+-	memset(&opt, 0, sizeof(struct tc_gred_sopt));
+ 	opt.DPs = dps;
+ 	opt.def_DP = def_dp;
+