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: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
d314737ad3
Коммит
036d6a673f
|
@ -693,13 +693,18 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
|
|||
if (new && i > 0)
|
||||
atomic_inc(&new->refcnt);
|
||||
|
||||
qdisc_destroy(old);
|
||||
if (!ingress)
|
||||
qdisc_destroy(old);
|
||||
}
|
||||
|
||||
notify_and_destroy(skb, n, classid, dev->qdisc, new);
|
||||
if (new && !new->ops->attach)
|
||||
atomic_inc(&new->refcnt);
|
||||
dev->qdisc = new ? : &noop_qdisc;
|
||||
if (!ingress) {
|
||||
notify_and_destroy(skb, n, classid, dev->qdisc, new);
|
||||
if (new && !new->ops->attach)
|
||||
atomic_inc(&new->refcnt);
|
||||
dev->qdisc = new ? : &noop_qdisc;
|
||||
} else {
|
||||
notify_and_destroy(skb, n, classid, old, new);
|
||||
}
|
||||
|
||||
if (dev->flags & IFF_UP)
|
||||
dev_activate(dev);
|
||||
|
|
Загрузка…
Ссылка в новой задаче