From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 15 May 2025 18:22:32 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: v6.16-rc1~132^2~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bebd7b262638af611a0e699ba37c43ec2238801b;p=thirdparty%2Fkernel%2Flinux.git

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

Cross-merge networking fixes after downstream PR (net-6.15-rc7).

Conflicts:

tools/testing/selftests/drivers/net/hw/ncdevmem.c
  97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array")
  2f1a805f32ba ("selftests: ncdevmem: Implement devmem TCP TX")
https://lore.kernel.org/20250514122900.1e77d62d@canb.auug.org.au

Adjacent changes:

net/core/devmem.c
net/core/devmem.h
  0afc44d8cdf6 ("net: devmem: fix kernel panic when netlink socket close after module unload")
  bd61848900bf ("net: devmem: Implement TX path")

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

bebd7b262638af611a0e699ba37c43ec2238801b
diff --cc tools/testing/selftests/drivers/net/hw/ncdevmem.c
index f801a1b3545f0,9d48004ff1a17..ca723722a8105
--- a/tools/testing/selftests/drivers/net/hw/ncdevmem.c
+++ b/tools/testing/selftests/drivers/net/hw/ncdevmem.c
@@@ -507,7 -431,23 +507,23 @@@ static int parse_address(const char *st
  	return 0;
  }
  
+ static struct netdev_queue_id *create_queues(void)
+ {
+ 	struct netdev_queue_id *queues;
+ 	size_t i = 0;
+ 
+ 	queues = calloc(num_queues, sizeof(*queues));
+ 	for (i = 0; i < num_queues; i++) {
+ 		queues[i]._present.type = 1;
+ 		queues[i]._present.id = 1;
+ 		queues[i].type = NETDEV_QUEUE_TYPE_RX;
+ 		queues[i].id = start_queue + i;
+ 	}
+ 
+ 	return queues;
+ }
+ 
 -int do_server(struct memory_buffer *mem)
 +static int do_server(struct memory_buffer *mem)
  {
  	char ctrl_data[sizeof(int) * 20000];
  	struct netdev_queue_id *queues;