git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
net
/
sched
/
sch_atm.c
diff --git
a/net/sched/sch_atm.c
b/net/sched/sch_atm.c
index
ca90f6e
..
2a8b83a
100644
(file)
--- a/
net/sched/sch_atm.c
+++ b/
net/sched/sch_atm.c
@@
-102,7
+102,8
@@
static int atm_tc_graft(struct Qdisc *sch, unsigned long arg,
return -EINVAL;
if (!new)
new = &noop_qdisc;
- *old = xchg(&flow->q, new);
+ *old = flow->q;
+ flow->q = new;
if (*old)
qdisc_reset(*old);
return 0;