Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern call ->pr_abort(so) now instead of generic PRU_ABORT.



details:   https://anonhg.NetBSD.org/src/rev/73db0ddeb5a9
branches:  trunk
changeset: 797870:73db0ddeb5a9
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jul 31 20:28:59 2014 +0000

description:
call ->pr_abort(so) now instead of generic PRU_ABORT.
fixes kern/49056, and appears to remove the only missed PRU_ABORT call.

diffstat:

 sys/kern/uipc_socket.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r a5f6ee9419e8 -r 73db0ddeb5a9 sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Thu Jul 31 15:55:08 2014 +0000
+++ b/sys/kern/uipc_socket.c    Thu Jul 31 20:28:59 2014 +0000
@@ -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 @@
        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);



Home | Main Index | Thread Index | Old Index