1 files changed, 3 insertions, 1 deletions

diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
index 83f5e69243c1..3a119f576bb3 100644
--- a/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@ -1100,7 +1100,9 @@ static int htb_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
                     == NULL)
                         return -ENOBUFS;
                 sch_tree_lock(sch);
-                if ((*old = xchg(&cl->un.leaf.q, new)) != NULL) {
+                *old = cl->un.leaf.q;
+                cl->un.leaf.q = new;
+                if (*old != NULL) {
                         qdisc_tree_decrease_qlen(*old, (*old)->q.qlen);
                         qdisc_reset(*old);
                 }