diff options
author | Patrick McHardy <kaber@trash.net> | 2008-11-20 07:11:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 07:11:36 -0500 |
commit | b94c8afcba3ae6584653b98e315446ea83be6ea5 (patch) | |
tree | 377fcfaf74e3aa38243c736a440e45b378355d8e /net/sched/sch_red.c | |
parent | c19d0369d4c791d90fe0b84d6040a897fe25cc14 (diff) |
pkt_sched: remove unnecessary xchg() in packet schedulers
The use of xchg() hasn't been necessary since 2.2.something when proper
locking was added to packet schedulers.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_red.c')
-rw-r--r-- | net/sched/sch_red.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 6a0371c22643..2bdf241f6315 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c | |||
@@ -202,7 +202,8 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt) | |||
202 | q->limit = ctl->limit; | 202 | q->limit = ctl->limit; |
203 | if (child) { | 203 | if (child) { |
204 | qdisc_tree_decrease_qlen(q->qdisc, q->qdisc->q.qlen); | 204 | qdisc_tree_decrease_qlen(q->qdisc, q->qdisc->q.qlen); |
205 | qdisc_destroy(xchg(&q->qdisc, child)); | 205 | qdisc_destroy(q->qdisc); |
206 | q->qdisc = child; | ||
206 | } | 207 | } |
207 | 208 | ||
208 | red_set_parms(&q->parms, ctl->qth_min, ctl->qth_max, ctl->Wlog, | 209 | red_set_parms(&q->parms, ctl->qth_min, ctl->qth_max, ctl->Wlog, |
@@ -283,7 +284,8 @@ static int red_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new, | |||
283 | new = &noop_qdisc; | 284 | new = &noop_qdisc; |
284 | 285 | ||
285 | sch_tree_lock(sch); | 286 | sch_tree_lock(sch); |
286 | *old = xchg(&q->qdisc, new); | 287 | *old = q->qdisc; |
288 | q->qdisc = new; | ||
287 | qdisc_tree_decrease_qlen(*old, (*old)->q.qlen); | 289 | qdisc_tree_decrease_qlen(*old, (*old)->q.qlen); |
288 | qdisc_reset(*old); | 290 | qdisc_reset(*old); |
289 | sch_tree_unlock(sch); | 291 | sch_tree_unlock(sch); |