From 24e748b0c24e7d6c220f0e1f99f69ad56bff0530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@helsinki.fi>
Date: Mon, 18 Aug 2008 22:30:01 -0700
Subject: [PATCH] --- yaml --- r: 108846 b: refs/heads/master c:
 e5befbd9525d92bb074b70192eb2c69aae65fc60 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/sched/sch_api.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 87aa413a91f4..c7fe6d4b263a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f593653742d1dd816c4e94c6e5154a57ccba6d1
+refs/heads/master: e5befbd9525d92bb074b70192eb2c69aae65fc60
diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c
index d91a2338877c..9372ec41ce84 100644
--- a/trunk/net/sched/sch_api.c
+++ b/trunk/net/sched/sch_api.c
@@ -1088,14 +1088,13 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 	}
 
 graft:
-	if (1) {
-		err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
-		if (err) {
-			if (q)
-				qdisc_destroy(q);
-			return err;
-		}
+	err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
+	if (err) {
+		if (q)
+			qdisc_destroy(q);
+		return err;
 	}
+
 	return 0;
 }