diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-02-25 14:55:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-29 17:02:33 -0500 |
| commit | 86a7996cc8a078793670d82ed97d5a99bb4e8496 (patch) | |
| tree | 8e5d26eb9e58b0c362c66f73baa5261793223178 /net/sched/sch_tbf.c | |
| parent | f12d33f4d83c6837d176e1aef337914089c77957 (diff) | |
| download | linux-stable-86a7996cc8a078793670d82ed97d5a99bb4e8496.tar.gz linux-stable-86a7996cc8a078793670d82ed97d5a99bb4e8496.tar.bz2 linux-stable-86a7996cc8a078793670d82ed97d5a99bb4e8496.zip | |
net_sched: introduce qdisc_replace() helper
Remove nearly duplicated code and prepare for the following patch.
Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_tbf.c')
| -rw-r--r-- | net/sched/sch_tbf.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index a4afde14e865..56a1aef3495f 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c @@ -502,13 +502,7 @@ static int tbf_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, if (new == NULL) new = &noop_qdisc; - sch_tree_lock(sch); - *old = q->qdisc; - q->qdisc = new; - qdisc_tree_decrease_qlen(*old, (*old)->q.qlen); - qdisc_reset(*old); - sch_tree_unlock(sch); - + *old = qdisc_replace(sch, new, &q->qdisc); return 0; } |