From: Stephen Hemminger <stephen@networkplumber.org>
Date: Mon, 26 Aug 2013 15:41:19 +0000 (-0700)
Subject: tc: allow qdisc without options
X-Git-Tag: v3.11.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9e78b0db0e023035e346ba67de838be851eb665;p=thirdparty%2Fiproute2.git

tc: allow qdisc without options

Pfifo_fast needs no options. So don't force it to have parsing code.
---

diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
index f3bf5b570..3002a56c3 100644
--- a/tc/tc_qdisc.c
+++ b/tc/tc_qdisc.c
@@ -137,15 +137,15 @@ 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 (q) {
-		if (!q->parse_qopt) {
-			fprintf(stderr, "qdisc '%s' does not support option parsing\n", k);
-			return -1;
-		}
-		if (q->parse_qopt(q, argc, argv, &req.n))
-			return 1;
-	} else {
-		if (argc) {
+	if (argc) {
+		if (q) {
+			if (!q->parse_qopt) {
+				fprintf(stderr, "qdisc '%s' does not support option parsing\n", k);
+				return -1;
+			}
+			if (q->parse_qopt(q, argc, argv, &req.n))
+				return 1;
+		} else {
 			if (matches(*argv, "help") == 0)
 				usage();