diff mbox series

[net,v2] net: mvpp2: prs: fix PPPoE with ipv6 packet parse

Message ID 1608230266-22111-1-git-send-email-stefanc@marvell.com
State Superseded
Headers show
Series [net,v2] net: mvpp2: prs: fix PPPoE with ipv6 packet parse | expand

Commit Message

Stefan Chulski Dec. 17, 2020, 6:37 p.m. UTC 
From: Stefan Chulski <stefanc@marvell.com>

Current PPPoE+IPv6 entry is jumping to 'next-hdr'
field and not to 'DIP' field as done for IPv4.

Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")
Reported-by: Liron Himi <lironh@marvell.com>
Signed-off-by: Stefan Chulski <stefanc@marvell.com>
---

Changes in v2:
- Fix "fixes tag"

 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

patchwork-bot+netdevbpf@kernel.org Dec. 19, 2020, 6:30 p.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Thu, 17 Dec 2020 20:37:46 +0200 you wrote:
> From: Stefan Chulski <stefanc@marvell.com>

> 

> Current PPPoE+IPv6 entry is jumping to 'next-hdr'

> field and not to 'DIP' field as done for IPv4.

> 

> Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit")

> Reported-by: Liron Himi <lironh@marvell.com>

> Signed-off-by: Stefan Chulski <stefanc@marvell.com>

> 

> [...]


Here is the summary with links:
  - [net,v2] net: mvpp2: prs: fix PPPoE with ipv6 packet parse
    https://git.kernel.org/netdev/net/c/fec6079b2eea

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
index b9e5b08..1a272c2 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
@@ -1655,8 +1655,9 @@  static int mvpp2_prs_pppoe_init(struct mvpp2 *priv)
 	mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP6);
 	mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP6,
 				 MVPP2_PRS_RI_L3_PROTO_MASK);
-	/* Skip eth_type + 4 bytes of IPv6 header */
-	mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 4,
+	/* Jump to DIP of IPV6 header */
+	mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 8 +
+				 MVPP2_MAX_L3_ADDR_SIZE,
 				 MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
 	/* Set L3 offset */
 	mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,