Move sfq_q_destroy() to above sfq_q_init() so that it can be used by an error case in a later patch.
Move sfq_destroy() as well, for clarity. Signed-off-by: Corey Hickey <[EMAIL PROTECTED]> --- net/sched/sch_sfq.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 1ba3d1a..ca22cb7 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -382,6 +382,17 @@ static void sfq_perturbation(unsigned long arg) } } +static void sfq_q_destroy(struct sfq_sched_data *q) +{ + del_timer(&q->perturb_timer); +} + +static void sfq_destroy(struct Qdisc *sch) +{ + struct sfq_sched_data *q = qdisc_priv(sch); + sfq_q_destroy(q); +} + static void sfq_default_parameters(struct Qdisc *sch) { @@ -451,17 +462,6 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt) return 0; } -static void sfq_q_destroy(struct sfq_sched_data *q) -{ - del_timer(&q->perturb_timer); -} - -static void sfq_destroy(struct Qdisc *sch) -{ - struct sfq_sched_data *q = qdisc_priv(sch); - sfq_q_destroy(q); -} - static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb) { struct sfq_sched_data *q = qdisc_priv(sch); -- 1.5.3 - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html