diff options
| author | WANG Cong <xiyou.wangcong@gmail.com> | 2016-02-25 23:55:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-29 23:02:33 +0100 |
| commit | 86a7996cc8a078793670d82ed97d5a99bb4e8496 (patch) | |
| tree | 8e5d26eb9e58b0c362c66f73baa5261793223178 /net/sched/sch_cbq.c | |
| parent | 3c59x: Ensure to apply the expires time (diff) | |
| download | linux-86a7996cc8a078793670d82ed97d5a99bb4e8496.tar.xz linux-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_cbq.c')
| -rw-r--r-- | net/sched/sch_cbq.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index c538d9e4a8f6..7f8474cdce32 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -1624,13 +1624,8 @@ static int cbq_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, new->reshape_fail = cbq_reshape_fail; #endif } - sch_tree_lock(sch); - *old = cl->q; - cl->q = new; - qdisc_tree_decrease_qlen(*old, (*old)->q.qlen); - qdisc_reset(*old); - sch_tree_unlock(sch); + *old = qdisc_replace(sch, new, &cl->q); return 0; } |