From 01e2243f4b32fadc7f132cb3349be2ed49521193 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 4 Jan 2012 06:23:01 +0000
Subject: [PATCH] --- yaml --- r: 279413 b: refs/heads/master c:
 02a9098ede0dc7e28c16a03fa7fba86a05219478 h: refs/heads/master i:   279411:
 954bb890a16d82e4a975e1be429df6dd88a9e562 v: v3

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

diff --git a/[refs] b/[refs]
index 755f0eb3a960..17f0b3f0a8a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd16a6cce2a7f169b559abc5672fd2c66e91fb36
+refs/heads/master: 02a9098ede0dc7e28c16a03fa7fba86a05219478
diff --git a/trunk/net/sched/sch_sfq.c b/trunk/net/sched/sch_sfq.c
index 16feb88503af..843018154a5c 100644
--- a/trunk/net/sched/sch_sfq.c
+++ b/trunk/net/sched/sch_sfq.c
@@ -591,12 +591,12 @@ static int sfq_init(struct Qdisc *sch, struct nlattr *opt)
 	q->cur_depth = 0;
 	q->tail = NULL;
 	q->divisor = SFQ_DEFAULT_HASH_DIVISOR;
-	if (opt == NULL) {
-		q->quantum = psched_mtu(qdisc_dev(sch));
-		q->scaled_quantum = SFQ_ALLOT_SIZE(q->quantum);
-		q->perturb_period = 0;
-		q->perturbation = net_random();
-	} else {
+	q->quantum = psched_mtu(qdisc_dev(sch));
+	q->scaled_quantum = SFQ_ALLOT_SIZE(q->quantum);
+	q->perturb_period = 0;
+	q->perturbation = net_random();
+
+	if (opt) {
 		int err = sfq_change(sch, opt);
 		if (err)
 			return err;