Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1774
b: refs/heads/master
c: 486b53e
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Graf authored and David S. Miller committed May 31, 2005
1 parent 44e8488 commit c972840
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0451eb074eef30240c6c06dacf2911bee26831e1
refs/heads/master: 486b53e59ca8cd07d91ad88375c1c884b15cc9bd
9 changes: 7 additions & 2 deletions trunk/net/sched/sch_dsmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit c972840

Please sign in to comment.