Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
sched
/
sch_dsmark.c
diff --git
a/kernel/net/sched/sch_dsmark.c
b/kernel/net/sched/sch_dsmark.c
index
f357f34
..
d0dff0c
100644
(file)
--- a/
kernel/net/sched/sch_dsmark.c
+++ b/
kernel/net/sched/sch_dsmark.c
@@
-73,13
+73,7
@@
static int dsmark_graft(struct Qdisc *sch, unsigned long arg,
new = &noop_qdisc;
}
new = &noop_qdisc;
}
- sch_tree_lock(sch);
- *old = p->q;
- p->q = new;
- qdisc_tree_decrease_qlen(*old, (*old)->q.qlen);
- qdisc_reset(*old);
- sch_tree_unlock(sch);
-
+ *old = qdisc_replace(sch, new, &p->q);
return 0;
}
return 0;
}
@@
-264,6
+258,7
@@
static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
return err;
}
return err;
}
+ qdisc_qstats_backlog_inc(sch, skb);
sch->q.qlen++;
return NET_XMIT_SUCCESS;
sch->q.qlen++;
return NET_XMIT_SUCCESS;
@@
-286,6
+281,7
@@
static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
return NULL;
qdisc_bstats_update(sch, skb);
return NULL;
qdisc_bstats_update(sch, skb);
+ qdisc_qstats_backlog_dec(sch, skb);
sch->q.qlen--;
index = skb->tc_index & (p->indices - 1);
sch->q.qlen--;
index = skb->tc_index & (p->indices - 1);
@@
-401,6
+397,7
@@
static void dsmark_reset(struct Qdisc *sch)
pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p);
qdisc_reset(p->q);
pr_debug("%s(sch %p,[qdisc %p])\n", __func__, sch, p);
qdisc_reset(p->q);
+ sch->qstats.backlog = 0;
sch->q.qlen = 0;
}
sch->q.qlen = 0;
}