* [PATCH] pkt_sched: Fix qdisc_graft WRT ingress qdisc
@ 2009-09-14 8:35 Jarek Poplawski
2009-09-14 17:58 ` Patrick McHardy
2009-09-15 0:10 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Jarek Poplawski @ 2009-09-14 8:35 UTC (permalink / raw)
To: David Miller; +Cc: Patrick McHardy, netdev
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>
---
net/sched/sch_api.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 3af1061..c5a6d62 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -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);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] pkt_sched: Fix qdisc_graft WRT ingress qdisc
2009-09-14 8:35 [PATCH] pkt_sched: Fix qdisc_graft WRT ingress qdisc Jarek Poplawski
@ 2009-09-14 17:58 ` Patrick McHardy
2009-09-15 0:10 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2009-09-14 17:58 UTC (permalink / raw)
To: Jarek Poplawski; +Cc: David Miller, netdev
Jarek Poplawski wrote:
> After the recent mq change using ingress qdisc overwrites dev->qdisc;
> there is also a wrong old qdisc pointer passed to notify_and_destroy.
Good catch, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] pkt_sched: Fix qdisc_graft WRT ingress qdisc
2009-09-14 8:35 [PATCH] pkt_sched: Fix qdisc_graft WRT ingress qdisc Jarek Poplawski
2009-09-14 17:58 ` Patrick McHardy
@ 2009-09-15 0:10 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2009-09-15 0:10 UTC (permalink / raw)
To: jarkao2; +Cc: kaber, netdev
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Mon, 14 Sep 2009 08:35:44 +0000
> 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>
Applied, thanks Jarek.
When I did the original TX multiqueue changes I tried to eliminate as
much as possible all of the special ways in which ingress qdiscs are
handled, but this area of how the ingress qdisc pointers are updated
remains.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-15 0:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-14 8:35 [PATCH] pkt_sched: Fix qdisc_graft WRT ingress qdisc Jarek Poplawski
2009-09-14 17:58 ` Patrick McHardy
2009-09-15 0:10 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).