diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-05-16 12:02:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-16 12:02:42 -0700 |
| commit | 7fecf0a1b72ce84d32e63d840c775fc440fc8261 (patch) | |
| tree | 5da86db80506018174b86c66d354735874e9439a /drivers | |
| parent | Merge branch 'rhashtable-Fix-sparse-warnings' (diff) | |
| parent | net/mlx5e: Fix calling wrong function to get inner vlan key and mask (diff) | |
| download | linux-dev-7fecf0a1b72ce84d32e63d840c775fc440fc8261.tar.xz linux-dev-7fecf0a1b72ce84d32e63d840c775fc440fc8261.zip | |
Merge branch 'flow_offload-fix-CVLAN-support'
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index 122f457091a2..542354b5eb4d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tc.c @@ -1595,7 +1595,7 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_CVLAN)) { struct flow_match_vlan match; - flow_rule_match_vlan(rule, &match); + flow_rule_match_cvlan(rule, &match); if (match.mask->vlan_id || match.mask->vlan_priority || match.mask->vlan_tpid) { |