Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

net/sched/sch_api.c

+10 −5
Original line number Diff line number Diff line
@@ -693,13 +693,18 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, 
			if (new && i > 0)

				atomic_inc(&new->refcnt);



			if (!ingress)

				qdisc_destroy(old);

		}



		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);