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

Cross-merge networking fixes after downstream PR (net-6.17-rc4).

No conflicts.

Adjacent changes:

drivers/net/ethernet/intel/idpf/idpf_txrx.c
  02614eee26fb ("idpf: do not linearize big TSO packets")
  6c4e68480238 ("idpf: remove obsolete stashing code")

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/idpf/idpf_txrx.c
index b868761fad4d7ec8be414a35dc21640425abf09b,eaad52a83b04c04a73e271e71b23673d149834da..194f924d2bd6e3d12a08b00cf4c4b265ae5d9845
--- 1/drivers/net/ethernet/intel/idpf/idpf_txrx.c
--- 2/drivers/net/ethernet/intel/idpf/idpf_txrx.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_txrx.c
@@@ -8,67 -8,12 +8,32 @@@
  #include "idpf_ptp.h"
  #include "idpf_virtchnl.h"
  
- struct idpf_tx_stash {
-       struct hlist_node hlist;
-       struct libeth_sqe buf;
- };
- 
- #define idpf_tx_buf_compl_tag(buf)    (*(u32 *)&(buf)->priv)
+ #define idpf_tx_buf_next(buf)         (*(u32 *)&(buf)->priv)
  LIBETH_SQE_CHECK_PRIV(u32);
  
 -static bool idpf_chk_linearize(struct sk_buff *skb, unsigned int max_bufs,
 -                             unsigned int count);
 +/**
 + * idpf_chk_linearize - Check if skb exceeds max descriptors per packet
 + * @skb: send buffer
 + * @max_bufs: maximum scatter gather buffers for single packet
 + * @count: number of buffers this packet needs
 + *
 + * Make sure we don't exceed maximum scatter gather buffers for a single
 + * packet.
 + * TSO case has been handled earlier from idpf_features_check().
 + */
 +static bool idpf_chk_linearize(const struct sk_buff *skb,
 +                             unsigned int max_bufs,
 +                             unsigned int count)
 +{
 +      if (likely(count <= max_bufs))
 +              return false;
 +
 +      if (skb_is_gso(skb))
 +              return false;
 +
 +      return true;
 +}
  
- /**
-  * idpf_buf_lifo_push - push a buffer pointer onto stack
-  * @stack: pointer to stack struct
-  * @buf: pointer to buf to push
-  *
-  * Returns 0 on success, negative on failure
-  **/
- static int idpf_buf_lifo_push(struct idpf_buf_lifo *stack,
-                             struct idpf_tx_stash *buf)
- {
-       if (unlikely(stack->top == stack->size))
-               return -ENOSPC;
- 
-       stack->bufs[stack->top++] = buf;
- 
-       return 0;
- }
- 
- /**
-  * idpf_buf_lifo_pop - pop a buffer pointer from stack
-  * @stack: pointer to stack struct
-  **/
- static struct idpf_tx_stash *idpf_buf_lifo_pop(struct idpf_buf_lifo *stack)
- {
-       if (unlikely(!stack->top))
-               return NULL;
- 
-       return stack->bufs[--stack->top];
- }
- 
  /**
   * idpf_tx_timeout - Respond to a Tx Hang
   * @netdev: network interface device structure

diff --cc drivers/net/ethernet/marvell/octeontx2/af/rvu.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/meta/fbnic/fbnic_netdev.c
Simple merge

diff --cc drivers/net/ethernet/meta/fbnic/fbnic_pci.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/phy/mscc/mscc.h
Simple merge

diff --cc drivers/net/phy/mscc/mscc_main.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/datagram.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge