From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 31 May 2005 22:16:52 +0000 (-0700)
Subject: [PKT_SCHED]: make dsmark try using pfifo instead of noop while grafting
X-Git-Tag: v2.6.12-rc6~33^2~2
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=486b53e59ca8cd07d91ad88375c1c884b15cc9bd;p=safe%2Fjmp%2Flinux-2.6

[PKT_SCHED]: make dsmark try using pfifo instead of noop while grafting

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index acbe9d2..a8c948f 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -73,8 +73,13 @@ static int dsmark_graft(struct Qdisc *sch,unsigned long arg,
 
 	DPRINTK("dsmark_graft(sch %p,[qdisc %p],new %p,old %p)\n",sch,p,new,
 	    old);
-	if (!new)
-		new = &noop_qdisc;
+
+	if (new == NULL) {
+		new = qdisc_create_dflt(sch->dev, &pfifo_qdisc_ops);
+		if (new == NULL)
+			new = &noop_qdisc;
+	}
+
 	sch_tree_lock(sch);
 	*old = xchg(&p->q,new);
 	if (*old)