[src/netbsd-9]: src/sys Pull up following revision(s) (requested by pgoyette ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f3f44008f96d
branches:  netbsd-9
changeset: 460410:f3f44008f96d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 21 20:06:17 2019 +0000

description:
Pull up following revision(s) (requested by pgoyette in ticket #339):

        sys/compat/common/kern_uipc_socket_50.c: revision 1.3
        sys/sys/compat_stub.h: revision 1.19
        sys/kern/uipc_socket.c: revision 1.284

Actually return the updated pointer-to-mbuf-pointer to the caller
rather than discarding-after-assignment.  Introduced from the
[pgoyette-compat] branch work.

diffstat:

 sys/compat/common/kern_uipc_socket_50.c |  12 ++++++------
 sys/kern/uipc_socket.c                  |   6 +++---
 sys/sys/compat_stub.h                   |   4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (86 lines):

diff -r ddedc7ee87e6 -r f3f44008f96d sys/compat/common/kern_uipc_socket_50.c
--- a/sys/compat/common/kern_uipc_socket_50.c   Thu Oct 17 19:39:31 2019 +0000
+++ b/sys/compat/common/kern_uipc_socket_50.c   Mon Oct 21 20:06:17 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_uipc_socket_50.c,v 1.2 2019/04/15 10:53:17 pgoyette Exp $ */
+/*     $NetBSD: kern_uipc_socket_50.c,v 1.2.6.1 2019/10/21 20:06:17 martin Exp $       */
 
 /*
  * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_uipc_socket_50.c,v 1.2 2019/04/15 10:53:17 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_uipc_socket_50.c,v 1.2.6.1 2019/10/21 20:06:17 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -210,7 +210,7 @@
 }
 
 static int
-uipc_socket_50_sbts(int opt, struct mbuf **mp)
+uipc_socket_50_sbts(int opt, struct mbuf ***mp)
 {
        struct timeval50 tv50;
        struct timeval tv;
@@ -220,10 +220,10 @@
        if (opt & SO_OTIMESTAMP) {
 
                timeval_to_timeval50(&tv, &tv50);
-               *mp = sbcreatecontrol(&tv50, sizeof(tv50), SCM_OTIMESTAMP,
+               **mp = sbcreatecontrol(&tv50, sizeof(tv50), SCM_OTIMESTAMP,
                    SOL_SOCKET);
-               if (*mp)
-                       mp = &(*mp)->m_next;
+               if (**mp)
+                       *mp = &(**mp)->m_next;
                return 0;
        } else
                return EPASSTHROUGH;
diff -r ddedc7ee87e6 -r f3f44008f96d sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c    Thu Oct 17 19:39:31 2019 +0000
+++ b/sys/kern/uipc_socket.c    Mon Oct 21 20:06:17 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_socket.c,v 1.281 2019/07/16 22:57:55 pgoyette Exp $       */
+/*     $NetBSD: uipc_socket.c,v 1.281.2.1 2019/10/21 20:06:17 martin 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.281 2019/07/16 22:57:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281.2.1 2019/10/21 20:06:17 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -2420,7 +2420,7 @@
 
        microtime(&tv);
 
-       MODULE_HOOK_CALL(uipc_socket_50_sbts_hook, (opt, mp), enosys(), error);
+       MODULE_HOOK_CALL(uipc_socket_50_sbts_hook, (opt, &mp), enosys(), error);
        if (error == 0)
                return mp;
 
diff -r ddedc7ee87e6 -r f3f44008f96d sys/sys/compat_stub.h
--- a/sys/sys/compat_stub.h     Thu Oct 17 19:39:31 2019 +0000
+++ b/sys/sys/compat_stub.h     Mon Oct 21 20:06:17 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: compat_stub.h,v 1.18 2019/07/20 20:59:05 mrg Exp $     */
+/*     $NetBSD: compat_stub.h,v 1.18.2.1 2019/10/21 20:06:17 martin Exp $      */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -231,7 +231,7 @@
     (int, struct socket *, const struct sockopt *));
 MODULE_HOOK(uipc_socket_50_getopt1_hook, int,
     (int, struct socket *, struct sockopt *));
-MODULE_HOOK(uipc_socket_50_sbts_hook, int, (int, struct mbuf **));
+MODULE_HOOK(uipc_socket_50_sbts_hook, int, (int, struct mbuf ***));
 
 /*
  * uipc_syscalls_50 compatibility