diff options
author | Eric Dumazet <edumazet@google.com> | 2014-09-17 11:05:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-19 16:32:10 -0400 |
commit | ab34f6480806263d7b4d00fa06d3647bac73b68c (patch) | |
tree | 5429ab1235fdaeb1318b44abb555725f3f36ef37 /net/sched | |
parent | 0ce77802f30b1820a88731f77b683567902ab2ef (diff) |
net: sched: use __skb_queue_head_init() where applicable
pfifo_fast and htb use skb lists, without needing their spinlocks.
(They instead use the standard qdisc lock)
We can use __skb_queue_head_init() instead of skb_queue_head_init()
to be consistent.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r-- | net/sched/sch_generic.c | 2 | ||||
-rw-r--r-- | net/sched/sch_htb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 346ef85617d3..11b28f651ad1 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c | |||
@@ -523,7 +523,7 @@ static int pfifo_fast_init(struct Qdisc *qdisc, struct nlattr *opt) | |||
523 | struct pfifo_fast_priv *priv = qdisc_priv(qdisc); | 523 | struct pfifo_fast_priv *priv = qdisc_priv(qdisc); |
524 | 524 | ||
525 | for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) | 525 | for (prio = 0; prio < PFIFO_FAST_BANDS; prio++) |
526 | skb_queue_head_init(band2list(priv, prio)); | 526 | __skb_queue_head_init(band2list(priv, prio)); |
527 | 527 | ||
528 | /* Can by-pass the queue discipline */ | 528 | /* Can by-pass the queue discipline */ |
529 | qdisc->flags |= TCQ_F_CAN_BYPASS; | 529 | qdisc->flags |= TCQ_F_CAN_BYPASS; |
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 6d16b9b81c28..14408f262143 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c | |||
@@ -1044,7 +1044,7 @@ static int htb_init(struct Qdisc *sch, struct nlattr *opt) | |||
1044 | 1044 | ||
1045 | qdisc_watchdog_init(&q->watchdog, sch); | 1045 | qdisc_watchdog_init(&q->watchdog, sch); |
1046 | INIT_WORK(&q->work, htb_work_func); | 1046 | INIT_WORK(&q->work, htb_work_func); |
1047 | skb_queue_head_init(&q->direct_queue); | 1047 | __skb_queue_head_init(&q->direct_queue); |
1048 | 1048 | ||
1049 | if (tb[TCA_HTB_DIRECT_QLEN]) | 1049 | if (tb[TCA_HTB_DIRECT_QLEN]) |
1050 | q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]); | 1050 | q->direct_qlen = nla_get_u32(tb[TCA_HTB_DIRECT_QLEN]); |