From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 25 Aug 2010 16:04:55 +0000 (-0700)
Subject: Fix GRED options clearing
X-Git-Tag: v2.6.37~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb4bd0ec8dcba856d1ebf8b3f72b79f669dad0f4;p=thirdparty%2Fiproute2.git

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 df4aa3d8a..59651d362 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;