diff options
| author | Pieter Jansen van Vuuren | 2018-09-11 15:38:44 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-09-12 22:18:30 +0200 |
| commit | db191db813722297be36ffce2862e0f2b0e54d82 (patch) | |
| tree | 7e752643f2f20d819ca499dc5827297272d20fa4 /drivers/net/ethernet/netronome/nfp/flower/match.c | |
| parent | tipc: check return value of __tipc_dump_start() (diff) | |
| download | kernel-qcow2-linux-db191db813722297be36ffce2862e0f2b0e54d82.tar.gz kernel-qcow2-linux-db191db813722297be36ffce2862e0f2b0e54d82.tar.xz kernel-qcow2-linux-db191db813722297be36ffce2862e0f2b0e54d82.zip | |
nfp: flower: fix vlan match by checking both vlan id and vlan pcp
Previously we only checked if the vlan id field is present when trying
to match a vlan tag. The vlan id and vlan pcp field should be treated
independently.
Fixes: 5571e8c9f241 ("nfp: extend flower matching capabilities")
Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/flower/match.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/match.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/match.c b/drivers/net/ethernet/netronome/nfp/flower/match.c index a0c72f277faa..17acb8cc6044 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/match.c +++ b/drivers/net/ethernet/netronome/nfp/flower/match.c @@ -56,7 +56,7 @@ nfp_flower_compile_meta_tci(struct nfp_flower_meta_tci *frame, FLOW_DISSECTOR_KEY_VLAN, target); /* Populate the tci field. */ - if (flow_vlan->vlan_id) { + if (flow_vlan->vlan_id || flow_vlan->vlan_priority) { tmp_tci = FIELD_PREP(NFP_FLOWER_MASK_VLAN_PRIO, flow_vlan->vlan_priority) | FIELD_PREP(NFP_FLOWER_MASK_VLAN_VID, |