diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-01 05:08:18 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-01 05:08:18 +0300 |
| commit | e8a8d8672824474720f86b91e30eeec2a258bc42 (patch) | |
| tree | 666a8d68c30f68fb6d6f439515194ef9c55464cc /net | |
| parent | 170b8ffa71412eeacb20589b807f4bc75a61e507 (diff) | |
| parent | 2f4b411a3d6766e6362ffbf00e0495a2dfe92507 (diff) | |
| download | linux-e8a8d8672824474720f86b91e30eeec2a258bc42.tar.xz | |
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
40GbE Intel Wired LAN Driver Updates 2017-10-31
This series contains updates to i40e, i40evf and net/sched.
Arnd Bergmann cleans up the power management code to resolve a build
warning.
Shannon Nelson fixes i40e to only redistribute our vectors when we did
not get the full count that we requested.
Alex reverts a previous commit because it potentially causes a memory leak
when combined with the current page recycling scheme.
Amritha enables configuring cloud filters in i40e using the tc-flower
classifier. The classification function of the filter is to match a
packet to a traffic class. cls_flower is extended to offload classid to
hardware. Hardware traffic classes are identified using classid values
reserved in the range :ffe0 - :ffef.
The cloud filters are added for a VSI and are cleaned up when the VSI is
deleted. The filters that match on L4 ports needs enhanced admin queue
functions with big buffer support for extended fields in cloud filter
commands.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/cls_flower.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 35cb6d684e44..c99fa9e5be46 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -241,6 +241,7 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, cls_flower.mask = mask; cls_flower.key = &f->mkey; cls_flower.exts = &f->exts; + cls_flower.classid = f->res.classid; err = tc_setup_cb_call(block, &f->exts, TC_SETUP_CLSFLOWER, &cls_flower, skip_sw); @@ -266,6 +267,7 @@ static void fl_hw_update_stats(struct tcf_proto *tp, struct cls_fl_filter *f) cls_flower.command = TC_CLSFLOWER_STATS; cls_flower.cookie = (unsigned long) f; cls_flower.exts = &f->exts; + cls_flower.classid = f->res.classid; tc_setup_cb_call(block, &f->exts, TC_SETUP_CLSFLOWER, &cls_flower, false); |