Merge branch 'flow_offload-fix-CVLAN-support'

Browse source

Edward Cree says:

====================
flow_offload: fix CVLAN support

When the flow_offload infrastructure was added, CVLAN matches weren't
 plumbed through, and flow_rule_match_vlan() was incorrectly called in
 the mlx5 driver when populating CVLAN match information.  This series
 adds flow_rule_match_cvlan(), and uses it in the mlx5 code.
Both patches should also go to 5.1 stable.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2019-05-16 12:02:42 -07:00

parent 2407a88a13 12d5cbf89a

commit 7fecf0a1b7

3 changed files with 10 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

View file

2

include/net/flow_offload.h

View file

7

net/core/flow_offload.c

View file