diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:01:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:01:20 +0100 |
| commit | 6203da9803017701da5782998157d9826215059d (patch) | |
| tree | 1d754f139ac25c643e88f429966606d3b44e431f /net/sched/sch_fq.c | |
| parent | staging: vt6656: Use BIT() macro in vnt_mac_reg_bits_* functions (diff) | |
| parent | Linux 5.6-rc7 (diff) | |
| download | linux-dev-6203da9803017701da5782998157d9826215059d.tar.xz linux-dev-6203da9803017701da5782998157d9826215059d.zip | |
Merge 5.6-rc7 into staging-next
We need the staging/iio fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sched/sch_fq.c')
| -rw-r--r-- | net/sched/sch_fq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c index a5a295477ecc..371ad84def3b 100644 --- a/net/sched/sch_fq.c +++ b/net/sched/sch_fq.c @@ -744,6 +744,7 @@ static const struct nla_policy fq_policy[TCA_FQ_MAX + 1] = { [TCA_FQ_FLOW_MAX_RATE] = { .type = NLA_U32 }, [TCA_FQ_BUCKETS_LOG] = { .type = NLA_U32 }, [TCA_FQ_FLOW_REFILL_DELAY] = { .type = NLA_U32 }, + [TCA_FQ_ORPHAN_MASK] = { .type = NLA_U32 }, [TCA_FQ_LOW_RATE_THRESHOLD] = { .type = NLA_U32 }, [TCA_FQ_CE_THRESHOLD] = { .type = NLA_U32 }, }; |