Module Name: src
Committed By: mrg
Date: Thu Jul 31 20:28:59 UTC 2014
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
call ->pr_abort(so) now instead of generic PRU_ABORT.
fixes kern/49056, and appears to remove the only missed PRU_ABORT call.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/kern/uipc_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_socket.c
diff -u src/sys/kern/uipc_socket.c:1.229 src/sys/kern/uipc_socket.c:1.230
--- src/sys/kern/uipc_socket.c:1.229 Thu Jul 31 03:39:35 2014
+++ src/sys/kern/uipc_socket.c Thu Jul 31 20:28:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.229 2014/07/31 03:39:35 rtr Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.230 2014/07/31 20:28:59 mrg Exp $ */
/*-
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.229 2014/07/31 03:39:35 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.230 2014/07/31 20:28:59 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_sock_counters.h"
@@ -778,8 +778,7 @@ soabort(struct socket *so)
KASSERT(so->so_head == NULL);
so->so_aborting++; /* XXX */
- error = (*so->so_proto->pr_usrreqs->pr_generic)(so,
- PRU_ABORT, NULL, NULL, NULL, NULL);
+ error = (*so->so_proto->pr_usrreqs->pr_abort)(so);
refs = --so->so_aborting; /* XXX */
if (error || (refs == 0)) {
sofree(so);
