From: David S. Miller <davem@davemloft.net>
Date: Thu, 16 May 2019 19:02:42 +0000 (-0700)
Subject: Merge branch 'flow_offload-fix-CVLAN-support'
X-Git-Tag: v5.15~6297^2~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fecf0a1b72ce84d32e63d840c775fc440fc8261;p=platform%2Fkernel%2Flinux-starfive.git

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

7fecf0a1b72ce84d32e63d840c775fc440fc8261