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(-)