[PATCH v2] net: ethernet: mtk_eth_soc: fix state in __mtk_foe_entry_clear: manual merge

[Matthieu Baerts]

Hello,

On 30/09/2022 02:56, Daniel Golle wrote:
> Setting ib1 state to MTK_FOE_STATE_UNBIND in __mtk_foe_entry_clear
> routine as done by commit 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc:
> fix typo in __mtk_foe_entry_clear") breaks flow offloading, at least
> on older MTK_NETSYS_V1 SoCs, OpenWrt users have confirmed the bug on
> MT7622 and MT7621 systems.
> Felix Fietkau suggested to use MTK_FOE_STATE_INVALID instead which
> works well on both, MTK_NETSYS_V1 and MTK_NETSYS_V2.
> 
> Tested on MT7622 (Linksys E8450) and MT7986 (BananaPi BPI-R3).
> 
> Suggested-by: Felix Fietkau <nbd at nbd.name>
> Fixes: 0e80707d94e4c8 ("net: ethernet: mtk_eth_soc: fix typo in __mtk_foe_entry_clear")
> Fixes: 33fc42de33278b ("net: ethernet: mtk_eth_soc: support creating mac address based offload entries")
> Signed-off-by: Daniel Golle <daniel at makrotopia.org>
> ---
> v2: rebased on top of netdev/net.git;main

FYI and as expected when reading this email thread, we got a small
conflict when merging -net in net-next in the MPTCP tree due to this
patch applied in -net:

  ae3ed15da588 ("net: ethernet: mtk_eth_soc: fix state in
__mtk_foe_entry_clear")

and this one from net-next:

  9d8cb4c096ab ("net: ethernet: mtk_eth_soc: add foe_entry_size to
mtk_eth_soc")

The conflict has been resolved on our side[1] inspired by Daniel's v1.
The resolution we suggest is attached to this email.

Cheers,
Matt

[1] https://github.com/multipath-tcp/mptcp_net-next/commit/7af5fac658ba
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 7af5fac658ba05d4f5ba19fa7e054aa4ef917128.patch
Type: text/x-patch
Size: 786 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-mediatek/attachments/20221003/be06b5aa/attachment-0001.bin>