From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 26 Feb 2026 18:20:47 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0314e382cf02983eb3c33ac537ad9701e7858bc9;p=thirdparty%2Flinux.git

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

Cross-merge networking fixes after downstream PR (net-7.0-rc2).

Conflicts:

tools/testing/selftests/drivers/net/hw/rss_ctx.py
  19c3a2a81d2b ("selftests: drv-net: rss: Generate unique ports for RSS context tests")
  ce5a0f4612db ("selftests: drv-net: rss_ctx: test RSS contexts persist after ifdown/up")

include/net/inet_connection_sock.h
  858d2a4f67ff6 ("tcp: fix potential race in tcp_v6_syn_recv_sock()")
  fcd3d039fab69 ("tcp: make tcp_v{4,6}_send_check() static")
https://lore.kernel.org/aZ8PSFLzBrEU3I89@sirena.org.uk

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c
drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
  69050f8d6d075 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
  bf4afc53b77ae ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")
  8a96b9144f18a ("net/mlx5e: Alloc xsk channel param out of mlx5e_open_xsk()")

Adjacent changes:

net/netfilter/ipvs/ip_vs_ctl.c
  c59bd9e62e06 ("ipvs: use more counters to avoid service lookups")
  bf4afc53b77a ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")

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

0314e382cf02983eb3c33ac537ad9701e7858bc9
diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
index 565e5c4ddccee,c5ba22eed8f19..96a259914cbde
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/pool.c
@@@ -91,13 -88,9 +90,13 @@@ static int mlx5e_xsk_enable_locked(stru
  	if (unlikely(!mlx5e_xsk_is_pool_sane(pool)))
  		return -EINVAL;
  
- 	cparam = kvzalloc_obj(*cparam, GFP_KERNEL);
++	cparam = kvzalloc_obj(*cparam);
 +	if (!cparam)
 +		return -ENOMEM;
 +
  	err = mlx5e_xsk_map_pool(mlx5_sd_ch_ix_get_dev(priv->mdev, ix), pool);
  	if (unlikely(err))
 -		return err;
 +		goto err_free_cparam;
  
  	err = mlx5e_xsk_add_pool(&priv->xsk, pool, ix);
  	if (unlikely(err))
diff --cc include/net/inet_connection_sock.h
index bbc9355871c76,5cb3056d6ddc7..433c2df23076d
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@@ -42,7 -42,10 +42,9 @@@ struct inet_connection_sock_af_ops 
  				      struct request_sock *req,
  				      struct dst_entry *dst,
  				      struct request_sock *req_unhash,
- 				      bool *own_req);
+ 				      bool *own_req,
+ 				      void (*opt_child_init)(struct sock *newsk,
+ 							     const struct sock *sk));
 -	u16	    net_header_len;
  	int	    (*setsockopt)(struct sock *sk, int level, int optname,
  				  sockptr_t optval, unsigned int optlen);
  	int	    (*getsockopt)(struct sock *sk, int level, int optname,
diff --cc tools/testing/selftests/drivers/net/hw/rss_ctx.py
index cbeb3a38fdfeb,b9b7527c2c6b9..97246eab863a6
--- a/tools/testing/selftests/drivers/net/hw/rss_ctx.py
+++ b/tools/testing/selftests/drivers/net/hw/rss_ctx.py
@@@ -4,13 -4,15 +4,16 @@@
  import datetime
  import random
  import re
+ import time
++from lib.py import ksft_disruptive
  from lib.py import ksft_run, ksft_pr, ksft_exit
  from lib.py import ksft_eq, ksft_ne, ksft_ge, ksft_in, ksft_lt, ksft_true, ksft_raises
  from lib.py import NetDrvEpEnv
  from lib.py import EthtoolFamily, NetdevFamily
  from lib.py import KsftSkipEx, KsftFailEx
 -from lib.py import ksft_disruptive
 -from lib.py import rand_port
 -from lib.py import cmd, ethtool, ip, defer, GenerateTraffic, CmdExitFailure, wait_file
 +from lib.py import rand_port, rand_ports
- from lib.py import ethtool, ip, defer, GenerateTraffic, CmdExitFailure
++from lib.py import cmd, ethtool, ip, defer, CmdExitFailure, wait_file
++from lib.py import GenerateTraffic
  
  
  def _rss_key_str(key):