From 8622e776f910513e077d822efc579cdb9ba09316 Mon Sep 17 00:00:00 2001 From: rwatson Date: Sat, 1 Apr 2006 15:15:05 +0000 Subject: Change protocol switch pru_abort() API so that it returns void rather than an int, as an error here is not meaningful. Modify soabort() to unconditionally free the socket on the return of pru_abort(), and modify most protocols to no longer conditionally free the socket, since the caller will do this. This commit likely leaves parts of netinet and netinet6 in a situation where they may panic or leak memory, as they have not are not fully updated by this commit. This will be corrected shortly in followup commits to these components. MFC after: 3 months --- sys/net/rtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/net/rtsock.c') diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index ea3bac2..ad64ef0 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -137,11 +137,11 @@ rts_input(struct mbuf *m) * It really doesn't make any sense at all for this code to share much * with raw_usrreq.c, since its functionality is so restricted. XXX */ -static int +static void rts_abort(struct socket *so) { - return (raw_usrreqs.pru_abort(so)); + raw_usrreqs.pru_abort(so); } /* pru_accept is EOPNOTSUPP */ -- cgit v1.1