Skip to contentSkip to conversation

net: mvpp2: prs: fix PPPoE with ipv6 packet parse

PATCH Applied [email protected] 2 participants 2 messages Dec 17, 2020 – Dec 19, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: mvpp2: prs: fix PPPoE with ipv6 packet parse

From: Stefan Chulski <[email protected]>

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")

---

Changes in v2:
- Fix "fixes tag"

 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c +3 -2
index b9e5b08..1a272c2 100644
@@ -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,
Signature · 1 line
1.9.1
#1 lore raw
This patch was applied to netdev/net.git (refs/heads/master):

Hello:

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

Quoted 10 lines · On Thu, 17 Dec 2020 20:37:46 +0200 you wrote:

From: Stefan Chulski <[email protected]>

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")

[...]

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