The branch main has been updated by glebius:
URL:
https://cgit.FreeBSD.org/src/commit/?id=56304579c17b81740bc448d7f5e06035b9d0fa2d
commit 56304579c17b81740bc448d7f5e06035b9d0fa2d
Author: Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2025-02-05 00:36:14 +0000
Commit: Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2025-02-05 00:54:20 +0000
netlink: remove _pru_ prefix from protosw method names
This is a relic that doesn't has any value now.
---
sys/netlink/netlink_domain.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
index 00eb2923eddf..94f880cbfb61 100644
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -311,7 +311,7 @@ nl_bind_locked(struct nlpcb *nlp, struct sockaddr_nl *snl)
}
static int
-nl_pru_attach(struct socket *so, int proto, struct thread *td)
+nl_attach(struct socket *so, int proto, struct thread *td)
{
struct nlpcb *nlp;
int error;
@@ -373,7 +373,7 @@ nl_pru_attach(struct socket *so, int proto, struct thread
*td)
}
static int
-nl_pru_bind(struct socket *so, struct sockaddr *sa, struct thread *td)
+nl_bind(struct socket *so, struct sockaddr *sa, struct thread *td)
{
struct nl_control *ctl = atomic_load_ptr(&V_nl_ctl);
struct nlpcb *nlp = sotonlpcb(so);
@@ -450,7 +450,7 @@ nl_autobind_port(struct nlpcb *nlp, uint32_t candidate_id)
}
static int
-nl_pru_connect(struct socket *so, struct sockaddr *sa, struct thread *td)
+nl_connect(struct socket *so, struct sockaddr *sa, struct thread *td)
{
struct sockaddr_nl *snl = (struct sockaddr_nl *)sa;
struct nlpcb *nlp;
@@ -537,7 +537,7 @@ nl_close(struct socket *so)
}
static int
-nl_pru_disconnect(struct socket *so)
+nl_disconnect(struct socket *so)
{
NL_LOG(LOG_DEBUG3, "socket %p, PID %d", so, curproc->p_pid);
MPASS(sotonlpcb(so) != NULL);
@@ -983,10 +983,10 @@ nl_setsbopt(struct socket *so, struct sockopt *sopt)
.pr_flags = PR_ATOMIC | PR_ADDR | PR_SOCKBUF, \
.pr_ctloutput = nl_ctloutput, \
.pr_setsbopt = nl_setsbopt, \
- .pr_attach = nl_pru_attach, \
- .pr_bind = nl_pru_bind, \
- .pr_connect = nl_pru_connect, \
- .pr_disconnect = nl_pru_disconnect, \
+ .pr_attach = nl_attach, \
+ .pr_bind = nl_bind, \
+ .pr_connect = nl_connect, \
+ .pr_disconnect = nl_disconnect, \
.pr_sosend = nl_sosend, \
.pr_soreceive = nl_soreceive, \
.pr_sockaddr = nl_sockaddr, \
