Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 036d6a673fa0a2e2c5b72a3b1d1b86114c1711c0

Authored by Jarek Poplawski
Committed by David S. Miller
1 parent d314737ad3
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 10 additions and 5 deletions Side-by-side Diff

... ... @@ -693,13 +693,18 @@
693 693 if (new && i > 0)
694 694 atomic_inc(&new->refcnt);
695 695  
696   - qdisc_destroy(old);
  696 + if (!ingress)
  697 + qdisc_destroy(old);
697 698 }
698 699  
699   - notify_and_destroy(skb, n, classid, dev->qdisc, new);
700   - if (new && !new->ops->attach)
701   - atomic_inc(&new->refcnt);
702   - dev->qdisc = new ? : &noop_qdisc;
  700 + if (!ingress) {
  701 + notify_and_destroy(skb, n, classid, dev->qdisc, new);
  702 + if (new && !new->ops->attach)
  703 + atomic_inc(&new->refcnt);
  704 + dev->qdisc = new ? : &noop_qdisc;
  705 + } else {
  706 + notify_and_destroy(skb, n, classid, old, new);
  707 + }
703 708  
704 709 if (dev->flags & IFF_UP)
705 710 dev_activate(dev);