|
@@ -545,6 +545,17 @@ EXPORT_SYMBOL(qdisc_reset);
|
|
static void __qdisc_destroy(struct rcu_head *head)
|
|
static void __qdisc_destroy(struct rcu_head *head)
|
|
{
|
|
{
|
|
struct Qdisc *qdisc = container_of(head, struct Qdisc, q_rcu);
|
|
struct Qdisc *qdisc = container_of(head, struct Qdisc, q_rcu);
|
|
|
|
+ const struct Qdisc_ops *ops = qdisc->ops;
|
|
|
|
+
|
|
|
|
+ gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est);
|
|
|
|
+ if (ops->reset)
|
|
|
|
+ ops->reset(qdisc);
|
|
|
|
+ if (ops->destroy)
|
|
|
|
+ ops->destroy(qdisc);
|
|
|
|
+
|
|
|
|
+ module_put(ops->owner);
|
|
|
|
+ dev_put(qdisc_dev(qdisc));
|
|
|
|
+
|
|
kfree((char *) qdisc - qdisc->padded);
|
|
kfree((char *) qdisc - qdisc->padded);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -552,21 +563,12 @@ static void __qdisc_destroy(struct rcu_head *head)
|
|
|
|
|
|
void qdisc_destroy(struct Qdisc *qdisc)
|
|
void qdisc_destroy(struct Qdisc *qdisc)
|
|
{
|
|
{
|
|
- const struct Qdisc_ops *ops = qdisc->ops;
|
|
|
|
-
|
|
|
|
if (qdisc->flags & TCQ_F_BUILTIN ||
|
|
if (qdisc->flags & TCQ_F_BUILTIN ||
|
|
!atomic_dec_and_test(&qdisc->refcnt))
|
|
!atomic_dec_and_test(&qdisc->refcnt))
|
|
return;
|
|
return;
|
|
|
|
|
|
list_del(&qdisc->list);
|
|
list_del(&qdisc->list);
|
|
- gen_kill_estimator(&qdisc->bstats, &qdisc->rate_est);
|
|
|
|
- if (ops->reset)
|
|
|
|
- ops->reset(qdisc);
|
|
|
|
- if (ops->destroy)
|
|
|
|
- ops->destroy(qdisc);
|
|
|
|
|
|
|
|
- module_put(ops->owner);
|
|
|
|
- dev_put(qdisc_dev(qdisc));
|
|
|
|
call_rcu(&qdisc->q_rcu, __qdisc_destroy);
|
|
call_rcu(&qdisc->q_rcu, __qdisc_destroy);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(qdisc_destroy);
|
|
EXPORT_SYMBOL(qdisc_destroy);
|