mbox series

[net,0/2] flow_offload: fix CVLAN support

Message ID 6ba9ac10-411c-aa04-a8fc-f4c7172fa75e@solarflare.com
Headers show
Series flow_offload: fix CVLAN support | expand

Message

Edward Cree May 14, 2019, 8:16 p.m. UTC 
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.

Edward Cree (1):
  flow_offload: support CVLAN match

Jianbo Liu (1):
  net/mlx5e: Fix calling wrong function to get inner vlan key and mask

 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +-
 include/net/flow_offload.h                      | 2 ++
 net/core/flow_offload.c                         | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

Comments

David Miller May 16, 2019, 7:03 p.m. UTC | #1 
From: Edward Cree <ecree@solarflare.com>
Date: Tue, 14 May 2019 21:16:08 +0100

> 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.

Series applied and queued up for -stable, thanks.