From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 20 Jun 2024 20:02:22 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.11-rc1~163^2~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6ec08beec9ea93f342d6daeac922208709694dc;p=thirdparty%2Fkernel%2Flinux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
  165f87691a89 ("bnxt_en: add timestamping statistics support")

No adjacent changes.

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

a6ec08beec9ea93f342d6daeac922208709694dc
diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7dc00c0d89924,a6d69a45fa014..1f72adaef709d
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -762,6 -753,8 +757,10 @@@ tx_dma_error
  tx_free:
  	dev_kfree_skb_any(skb);
  tx_kick_pending:
 -	if (BNXT_TX_PTP_IS_SET(lflags))
++	if (BNXT_TX_PTP_IS_SET(lflags)) {
++		atomic64_inc(&bp->ptp_cfg->stats.ts_err);
+ 		atomic_inc(&bp->ptp_cfg->tx_avail);
++	}
  	if (txr->kick_pending)
  		bnxt_txr_db_kick(bp, txr, txr->tx_prod);
  	txr->tx_buf_ring[txr->tx_prod].skb = NULL;