From: Breno Leitao <leitao@debian•org>
To: "David S. Miller" <davem@davemloft•net>,
Eric Dumazet <edumazet@google•com>,
Jakub Kicinski <kuba@kernel•org>,
Paolo Abeni <pabeni@redhat•com>, Simon Horman <horms@kernel•org>,
Breno Leitao <leitao@debian•org>,
Andrew Lunn <andrew+netdev@lunn•ch>
Cc: netdev@vger•kernel.org, linux-kernel@vger•kernel.org,
kernel-team@meta•com
Subject: [PATCH net-next 2/5] netconsole: move netpoll_parse_ip_addr() earlier for reuse
Date: Fri, 18 Jul 2025 04:52:02 -0700 [thread overview]
Message-ID: <20250718-netconsole_ref-v1-2-86ef253b7a7a@debian.org> (raw)
In-Reply-To: <20250718-netconsole_ref-v1-0-86ef253b7a7a@debian.org>
Move netpoll_parse_ip_addr() earlier in the file to be reused in
other functions, such as local_ip_store(). This avoids duplicate
address parsing logic and centralizes validation for both IPv4
and IPv6 string input.
No functional changes intended.
Signed-off-by: Breno Leitao <leitao@debian•org>
---
drivers/net/netconsole.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index e3722de08ea9f..be946e8be72b1 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -360,6 +360,26 @@ static void trim_newline(char *s, size_t maxlen)
s[len - 1] = '\0';
}
+static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)
+{
+ const char *end;
+
+ if (!strchr(str, ':') &&
+ in4_pton(str, -1, (void *)addr, -1, &end) > 0) {
+ if (!*end)
+ return 0;
+ }
+ if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {
+#if IS_ENABLED(CONFIG_IPV6)
+ if (!*end)
+ return 1;
+#else
+ return -1;
+#endif
+ }
+ return -1;
+}
+
/*
* Attribute operations for netconsole_target.
*/
@@ -1742,26 +1762,6 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)
spin_unlock_irqrestore(&target_list_lock, flags);
}
-static int netpoll_parse_ip_addr(const char *str, union inet_addr *addr)
-{
- const char *end;
-
- if (!strchr(str, ':') &&
- in4_pton(str, -1, (void *)addr, -1, &end) > 0) {
- if (!*end)
- return 0;
- }
- if (in6_pton(str, -1, addr->in6.s6_addr, -1, &end) > 0) {
-#if IS_ENABLED(CONFIG_IPV6)
- if (!*end)
- return 1;
-#else
- return -1;
-#endif
- }
- return -1;
-}
-
static int netconsole_parser_cmdline(struct netpoll *np, char *opt)
{
bool ipversion_set = false;
--
2.47.1
next prev parent reply other threads:[~2025-07-18 11:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-18 11:52 [PATCH net-next 0/5] netconsole: reuse netpoll_parse_ip_addr in configfs helpers Breno Leitao
2025-07-18 11:52 ` [PATCH net-next 1/5] netpoll: Remove unused fields from inet_addr union Breno Leitao
2025-07-18 11:52 ` Breno Leitao [this message]
2025-07-18 17:03 ` [PATCH net-next 2/5] netconsole: move netpoll_parse_ip_addr() earlier for reuse Jakub Kicinski
2025-07-19 0:03 ` kernel test robot
2025-07-18 11:52 ` [PATCH net-next 3/5] netconsole: add support for strings with new line in netpoll_parse_ip_addr Breno Leitao
2025-07-18 11:52 ` [PATCH net-next 4/5] netconsole: use netpoll_parse_ip_addr in local_ip_store Breno Leitao
2025-07-18 11:52 ` [PATCH net-next 5/5] " Breno Leitao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250718-netconsole_ref-v1-2-86ef253b7a7a@debian.org \
--to=leitao@debian$(echo .)org \
--cc=andrew+netdev@lunn$(echo .)ch \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=horms@kernel$(echo .)org \
--cc=kernel-team@meta$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox