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/atm | |
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/atm')
0 files changed, 0 insertions, 0 deletions