]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
octeontx2-pf: send correct vlan priority mask to npc_install_flow_req
authorNaveen Mamindlapalli <naveenm@marvell.com>
Sun, 22 Aug 2021 12:02:22 +0000 (17:32 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 08:00:50 +0000 (10:00 +0200)
[ Upstream commit 10df5a13ac6785b409ad749c4b10d4b220cc7e71 ]

This patch corrects the erroneous vlan priority mask field that was
send to npc_install_flow_req.

Fixes: 1d4d9e42c240 ("octeontx2-pf: Add tc flower hardware offload on ingress traffic")
Signed-off-by: Naveen Mamindlapalli <naveenm@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

index 51157b283f6f7888675d318a0badccdfb5f2d357..463d2368c11800f820de00a750e25b7f81cb2d25 100644 (file)
@@ -385,8 +385,8 @@ static int otx2_tc_prepare_flow(struct otx2_nic *nic,
                                   match.key->vlan_priority << 13;
 
                        vlan_tci_mask = match.mask->vlan_id |
-                                       match.key->vlan_dei << 12 |
-                                       match.key->vlan_priority << 13;
+                                       match.mask->vlan_dei << 12 |
+                                       match.mask->vlan_priority << 13;
 
                        flow_spec->vlan_tci = htons(vlan_tci);
                        flow_mask->vlan_tci = htons(vlan_tci_mask);