Commit 036d6a67 authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller

pkt_sched: Fix qdisc_graft WRT ingress qdisc

After the recent mq change using ingress qdisc overwrites dev->qdisc;
there is also a wrong old qdisc pointer passed to notify_and_destroy.
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d314737a
...@@ -693,13 +693,18 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, ...@@ -693,13 +693,18 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
if (new && i > 0) if (new && i > 0)
atomic_inc(&new->refcnt); atomic_inc(&new->refcnt);
if (!ingress)
qdisc_destroy(old); qdisc_destroy(old);
} }
if (!ingress) {
notify_and_destroy(skb, n, classid, dev->qdisc, new); notify_and_destroy(skb, n, classid, dev->qdisc, new);
if (new && !new->ops->attach) if (new && !new->ops->attach)
atomic_inc(&new->refcnt); atomic_inc(&new->refcnt);
dev->qdisc = new ? : &noop_qdisc; dev->qdisc = new ? : &noop_qdisc;
} else {
notify_and_destroy(skb, n, classid, old, new);
}
if (dev->flags & IFF_UP) if (dev->flags & IFF_UP)
dev_activate(dev); dev_activate(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment