kernel: merge pending fq_codel backlog accounting fix

[openwrt/openwrt.git] / target / linux / generic / patches-4.4 / 662-use_fq_codel_by_default.patch

diff --git a/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch b/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch
index a56dec330a4810ea1d16b4605cc37c97699b0349..8952ab4e206b477f6392d17cf249f90de60232f4 100644 (file)
--- a/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch
+++ b/target/linux/generic/patches-4.4/662-use_fq_codel_by_default.patch
@@ -13,7 +13,7 @@
          device, it has to decide which ones to send first, which ones to
 --- a/net/sched/sch_fq_codel.c
 +++ b/net/sched/sch_fq_codel.c
-@@ -676,7 +676,7 @@ static const struct Qdisc_class_ops fq_c
+@@ -688,7 +688,7 @@ static const struct Qdisc_class_ops fq_c
        .walk           =       fq_codel_walk,
  };
  
@@ -22,7 +22,7 @@
        .cl_ops         =       &fq_codel_class_ops,
        .id             =       "fq_codel",
        .priv_size      =       sizeof(struct fq_codel_sched_data),
-@@ -692,6 +692,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
+@@ -704,6 +704,7 @@ static struct Qdisc_ops fq_codel_qdisc_o
        .dump_stats =   fq_codel_dump_stats,
        .owner          =       THIS_MODULE,
  };