adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

pkt_sched: Fix qdisc_graft WRT ingress qdisc

Browse source 
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:
Jarek Poplawski 2009-09-13 22:35:44 +00:00 committed by David S. Miller
parent d314737ad3
commit 036d6a673f
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
net/sched/sch_api.c
View file

@ -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);
qdisc_destroy(old); if (!ingress)
qdisc_destroy(old);
} }
notify_and_destroy(skb, n, classid, dev->qdisc, new); if (!ingress) {
if (new && !new->ops->attach) notify_and_destroy(skb, n, classid, dev->qdisc, new);
atomic_inc(&new->refcnt); if (new && !new->ops->attach)
dev->qdisc = new ? : &noop_qdisc; atomic_inc(&new->refcnt);
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);