From: Corey Hickey <bugfood-ml@fatooh.org>
To: netdev@vger.kernel.org
Cc: Corey Hickey <bugfood-ml@fatooh.org>
Subject: [PATCH 3/7] Move two functions.
Date: Sun, 29 Jul 2007 17:21:12 -0700 [thread overview]
Message-ID: <11857548782786-git-send-email-bugfood-ml@fatooh.org> (raw)
In-Reply-To: <11857548771998-git-send-email-bugfood-ml@fatooh.org>
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 <bugfood-ml@fatooh.org>
---
net/sched/sch_sfq.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 0c46938..583f925 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -380,6 +380,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 int sfq_q_init(struct sfq_sched_data *q, struct rtattr *opt)
{
struct tc_sfq_qopt *ctl = RTA_DATA(opt);
@@ -420,7 +431,7 @@ static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
{
struct sfq_sched_data *q = qdisc_priv(sch);
int err;
-
+
q->quantum = psched_mtu(sch->dev); /* default */
if ((err = sfq_q_init(q, opt)))
return err;
@@ -436,17 +447,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.2.4
next prev parent reply other threads:[~2007-07-30 0:21 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-30 0:21 SFQ: backport some features from ESFQ (try 2) Corey Hickey
2007-07-30 0:21 ` [PATCH 1/7] Preparatory refactoring part 1 Corey Hickey
2007-07-30 13:51 ` Patrick McHardy
2007-07-31 1:26 ` Corey Hickey
2007-07-31 10:46 ` Patrick McHardy
2007-07-30 0:21 ` [PATCH 2/7] Preparatory refactoring part 2 Corey Hickey
2007-07-30 13:59 ` Patrick McHardy
2007-07-31 7:43 ` Corey Hickey
2007-07-30 0:21 ` Corey Hickey [this message]
2007-07-30 0:21 ` [PATCH 4/7] Add "depth" Corey Hickey
2007-07-30 0:21 ` [PATCH 5/7] Add divisor Corey Hickey
2007-07-30 0:21 ` [PATCH 6/7] Make qdisc changeable Corey Hickey
2007-07-30 14:11 ` Patrick McHardy
2007-07-31 7:43 ` Corey Hickey
2007-08-06 2:47 ` Corey Hickey
2007-08-06 12:06 ` Patrick McHardy
2007-07-30 0:21 ` [PATCH 7/7] Remove comments about hardcoded values Corey Hickey
2007-07-30 0:21 ` [PATCH] [iproute2] SFQ: Support changing depth and divisor Corey Hickey
-- strict thread matches above, loose matches on Subject: below --
2007-07-29 7:08 [PATCH 0/7] SFQ: backport some features from ESFQ Corey Hickey
2007-07-29 7:08 ` [PATCH 1/7] Preparatory refactoring part 1 Corey Hickey
2007-07-29 7:08 ` [PATCH 2/7] Preparatory refactoring part 2 Corey Hickey
2007-07-29 7:08 ` [PATCH 3/7] Move two functions Corey Hickey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11857548782786-git-send-email-bugfood-ml@fatooh.org \
--to=bugfood-ml@fatooh.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).