netpoll: move netpoll_print_options to netconsole

Move netpoll_print_options() from net/core/netpoll.c to
drivers/net/netconsole.c and make it static. This function is only used
by netconsole, so there's no need to export it or keep it in the public
netpoll API.

This reduces the netpoll API surface and improves code locality
by keeping netconsole-specific functionality within the netconsole
driver.

Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20250613-rework-v3-4-0752bf2e6912@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index bc145e4cf6e729563b11556e9cb7731760dc1e7f..71522fb0eeeef0d73d80446b0de957ad2541a43b 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -278,6 +278,23 @@ static void netconsole_process_cleanups_core(void)
        mutex_unlock(&target_cleanup_list_lock);
 }
 
+static void netpoll_print_options(struct netpoll *np)
+{
+       np_info(np, "local port %d\n", np->local_port);
+       if (np->ipv6)
+               np_info(np, "local IPv6 address %pI6c\n", &np->local_ip.in6);
+       else
+               np_info(np, "local IPv4 address %pI4\n", &np->local_ip.ip);
+       np_info(np, "interface name '%s'\n", np->dev_name);
+       np_info(np, "local ethernet address '%pM'\n", np->dev_mac);
+       np_info(np, "remote port %d\n", np->remote_port);
+       if (np->ipv6)
+               np_info(np, "remote IPv6 address %pI6c\n", &np->remote_ip.in6);
+       else
+               np_info(np, "remote IPv4 address %pI4\n", &np->remote_ip.ip);
+       np_info(np, "remote ethernet address %pM\n", np->remote_mac);
+}
+
 #ifdef CONFIG_NETCONSOLE_DYNAMIC
 
 /*

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 1b8000954e52ae3b9f9c826c5ae96d0d2e51a43b..735e65c3cc11408ae1729f2b1db283920015c559 100644 (file)
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -72,7 +72,6 @@ static inline void netpoll_poll_enable(struct net_device *dev) { return; }
 #endif
 
 int netpoll_send_udp(struct netpoll *np, const char *msg, int len);
-void netpoll_print_options(struct netpoll *np);
 int __netpoll_setup(struct netpoll *np, struct net_device *ndev);
 int netpoll_setup(struct netpoll *np);
 void __netpoll_free(struct netpoll *np);

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index d2965c916130d741c53b72ecc8854dd7a46b24d2..07c453864a7dfcd70d1d7274c20bb9f3d12240f9 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -492,23 +492,6 @@ int netpoll_send_udp(struct netpoll *np, const char *msg, int len)
 }
 EXPORT_SYMBOL(netpoll_send_udp);
 
-void netpoll_print_options(struct netpoll *np)
-{
-       np_info(np, "local port %d\n", np->local_port);
-       if (np->ipv6)
-               np_info(np, "local IPv6 address %pI6c\n", &np->local_ip.in6);
-       else
-               np_info(np, "local IPv4 address %pI4\n", &np->local_ip.ip);
-       np_info(np, "interface name '%s'\n", np->dev_name);
-       np_info(np, "local ethernet address '%pM'\n", np->dev_mac);
-       np_info(np, "remote port %d\n", np->remote_port);
-       if (np->ipv6)
-               np_info(np, "remote IPv6 address %pI6c\n", &np->remote_ip.in6);
-       else
-               np_info(np, "remote IPv4 address %pI4\n", &np->remote_ip.ip);
-       np_info(np, "remote ethernet address %pM\n", np->remote_mac);
-}
-EXPORT_SYMBOL(netpoll_print_options);
 
 static void skb_pool_flush(struct netpoll *np)
 {