kernel: Update kernel 4.19 to version 4.19.131

[openwrt/openwrt.git] / target / linux / generic / backport-4.19 / 391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch

diff --git a/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch b/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch
index 9ac1388c98a6ed34b0e2e89c3f608d8d818949e1..638a2b4529660c02bd5d167cb0a45ede56aaf78f 100644 (file)
--- a/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch
+++ b/target/linux/generic/backport-4.19/391-v5.1-sch_cake-Permit-use-of-connmarks-as-tin-classifiers.patch
@@ -91,7 +91,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  };
  
  /* COBALT operates the Codel and BLUE algorithms in parallel, in order to
-@@ -2623,6 +2624,13 @@ static int cake_change(struct Qdisc *sch
+@@ -2647,6 +2648,13 @@ static int cake_change(struct Qdisc *sch
                        q->rate_flags &= ~CAKE_FLAG_SPLIT_GSO;
        }
  
@@ -105,7 +105,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (q->tins) {
                sch_tree_lock(sch);
                cake_reconfigure(sch);
-@@ -2782,6 +2790,10 @@ static int cake_dump(struct Qdisc *sch,
+@@ -2806,6 +2814,10 @@ static int cake_dump(struct Qdisc *sch,
                        !!(q->rate_flags & CAKE_FLAG_SPLIT_GSO)))
                goto nla_put_failure;