From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 30 Mar 2023 21:43:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.6.7~2736^2~201
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79548b7984e4c606c6caaad72a0864a83855ebc9;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./linux/kernel/git/netdev/net

Conflicts:

drivers/net/ethernet/mediatek/mtk_ppe.c
  3fbe4d8c0e53 ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
  924531326e2d ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

79548b7984e4c606c6caaad72a0864a83855ebc9
diff --cc MAINTAINERS
index 91201c2,e01e546..4c2b84b
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -14664,12 -14657,11 +14665,10 @@@ F:	net/ipv4/nexthop.
  
  NFC SUBSYSTEM
  M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
- L:	linux-nfc@lists.01.org (subscribers-only)
  L:	netdev@vger.kernel.org
  S:	Maintained
- B:	mailto:linux-nfc@lists.01.org
  F:	Documentation/devicetree/bindings/net/nfc/
  F:	drivers/nfc/
 -F:	include/linux/platform_data/nfcmrvl.h
  F:	include/net/nfc/
  F:	include/uapi/linux/nfc.h
  F:	net/nfc/
diff --cc drivers/net/ethernet/mediatek/mtk_ppe.c
index c099e87,fd07d6e..f9c9f2e
--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
+++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
@@@ -500,13 -459,7 +501,15 @@@ __mtk_foe_entry_clear(struct mtk_ppe *p
  		hwe->ib1 &= ~MTK_FOE_IB1_STATE;
  		hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
  		dma_wmb();
+ 		mtk_ppe_cache_clear(ppe);
++
 +		if (ppe->accounting) {
 +			struct mtk_foe_accounting *acct;
 +
 +			acct = ppe->acct_table + entry->hash * sizeof(*acct);
 +			acct->packets = 0;
 +			acct->bytes = 0;
 +		}
  	}
  	entry->hash = 0xffff;