We never interesting soabort() return value.
I don't see any reason to change pru_abort() return type right now,
because it calls (*pru_usrreq)() within. I'll modify it with the
upcoming PRU_ABORT split.
Index: sys/kern/uipc_socket.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_socket.c,v
retrieving revision 1.283
diff -u -p -r1.283 uipc_socket.c
--- sys/kern/uipc_socket.c 15 Aug 2022 09:11:38 -0000 1.283
+++ sys/kern/uipc_socket.c 20 Aug 2022 22:50:46 -0000
@@ -407,7 +407,7 @@ drop:
(void) soqremque(so2, 0);
if (persocket)
sounlock(so);
- (void) soabort(so2);
+ soabort(so2);
if (persocket)
solock(so);
}
@@ -417,7 +417,7 @@ drop:
(void) soqremque(so2, 1);
if (persocket)
sounlock(so);
- (void) soabort(so2);
+ soabort(so2);
if (persocket)
solock(so);
}
@@ -431,12 +431,11 @@ discard:
return (error);
}
-int
+void
soabort(struct socket *so)
{
soassertlocked(so);
-
- return pru_abort(so);
+ pru_abort(so);
}
int
Index: sys/netinet/tcp_input.c
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_input.c,v
retrieving revision 1.377
diff -u -p -r1.377 tcp_input.c
--- sys/netinet/tcp_input.c 11 Aug 2022 09:13:21 -0000 1.377
+++ sys/netinet/tcp_input.c 20 Aug 2022 22:50:46 -0000
@@ -3659,7 +3659,7 @@ resetandabort:
abort:
m_freem(m);
if (so != NULL)
- (void) soabort(so);
+ soabort(so);
syn_cache_put(sc);
tcpstat_inc(tcps_sc_aborted);
return ((struct socket *)(-1));
Index: sys/sys/socketvar.h
===================================================================
RCS file: /cvs/src/sys/sys/socketvar.h,v
retrieving revision 1.107
diff -u -p -r1.107 socketvar.h
--- sys/sys/socketvar.h 13 Aug 2022 21:01:46 -0000 1.107
+++ sys/sys/socketvar.h 20 Aug 2022 22:50:46 -0000
@@ -313,7 +313,7 @@ int sbreserve(struct socket *, struct so
int sbwait(struct socket *, struct sockbuf *);
int sb_lock(struct sockbuf *);
void soinit(void);
-int soabort(struct socket *);
+void soabort(struct socket *);
int soaccept(struct socket *, struct mbuf *);
int sobind(struct socket *, struct mbuf *, struct proc *);
void socantrcvmore(struct socket *);
