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 /include | |
| parent | 2407a88a13a2d03ea9b8c86bbdedb3eff80c4b9e (diff) | |
| parent | 12d5cbf89a6599f6bbd7b373dba0e74b5bd9c505 (diff) | |
| download | cachepc-linux-7fecf0a1b72ce84d32e63d840c775fc440fc8261.tar.gz cachepc-linux-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 'include')
| -rw-r--r-- | include/net/flow_offload.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index 6200900434e1..a2df99f9b196 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -71,6 +71,8 @@ void flow_rule_match_eth_addrs(const struct flow_rule *rule, struct flow_match_eth_addrs *out); void flow_rule_match_vlan(const struct flow_rule *rule, struct flow_match_vlan *out); +void flow_rule_match_cvlan(const struct flow_rule *rule, + struct flow_match_vlan *out); void flow_rule_match_ipv4_addrs(const struct flow_rule *rule, struct flow_match_ipv4_addrs *out); void flow_rule_match_ipv6_addrs(const struct flow_rule *rule, |