[src/netbsd-8]: src/sys/compat/netbsd32 Pull up following revision(s) (reques...

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

details:   https://anonhg.NetBSD.org/src/rev/c3b5ddc044c5
branches:  netbsd-8
changeset: 852444:c3b5ddc044c5
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 22 16:27:29 2019 +0000

description:
Pull up following revision(s) (requested by rin in ticket #1054):

        sys/compat/netbsd32/netbsd32_ioctl.h: revision 1.65
        sys/compat/netbsd32/netbsd32_ioctl.c: revision 1.98
        sys/compat/netbsd32/netbsd32_ioctl.c: revision 1.99

PR/53666: Rin Okuyama: tcpdump for i386 does not work with COMPAT_NETBSD32
on amd64. Add BIOCSRTIMEOUT32.

 -

Correct misleading names of dummy variables. No binary changes intended.

diffstat:

 sys/compat/netbsd32/netbsd32_ioctl.c |  10 ++++++++--
 sys/compat/netbsd32/netbsd32_ioctl.h |   3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 042519112c12 -r c3b5ddc044c5 sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Wed Jul 17 16:22:40 2019 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Mon Jul 22 16:27:29 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.c,v 1.89.8.1 2017/11/27 14:07:53 martin Exp $   */
+/*     $NetBSD: netbsd32_ioctl.c,v 1.89.8.2 2019/07/22 16:27:29 martin Exp $   */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.89.8.1 2017/11/27 14:07:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.89.8.2 2019/07/22 16:27:29 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
@@ -1303,6 +1303,12 @@
                IOCTL_STRUCT_CONV_TO(BIOCSUDPF, bpf_program);
        case BIOCGDLTLIST32:
                IOCTL_STRUCT_CONV_TO(BIOCGDLTLIST, bpf_dltlist);
+       case BIOCSRTIMEOUT32:
+#define netbsd32_to_timeval(s32p, p, cmd) netbsd32_to_timeval(s32p, p)
+#define netbsd32_from_timeval(p, s32p, cmd) netbsd32_from_timeval(p, s32p)
+               IOCTL_STRUCT_CONV_TO(BIOCSRTIMEOUT, timeval);
+#undef netbsd32_to_timeval
+#undef netbsd32_from_timeval
 
        case WSDISPLAYIO_ADDSCREEN32:
                IOCTL_STRUCT_CONV_TO(WSDISPLAYIO_ADDSCREEN, wsdisplay_addscreendata);
diff -r 042519112c12 -r c3b5ddc044c5 sys/compat/netbsd32/netbsd32_ioctl.h
--- a/sys/compat/netbsd32/netbsd32_ioctl.h      Wed Jul 17 16:22:40 2019 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.h      Mon Jul 22 16:27:29 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.h,v 1.56.8.1 2017/11/27 14:07:53 martin Exp $   */
+/*     $NetBSD: netbsd32_ioctl.h,v 1.56.8.2 2019/07/22 16:27:29 martin Exp $   */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -116,6 +116,7 @@
 #define BIOCSTCPF32    _IOW('B',114, struct netbsd32_bpf_program)
 #define BIOCSUDPF32    _IOW('B',115, struct netbsd32_bpf_program)
 #define BIOCGDLTLIST32 _IOWR('B',119, struct netbsd32_bpf_dltlist)
+#define BIOCSRTIMEOUT32        _IOW('B',122, struct netbsd32_timeval)
 
 
 struct netbsd32_wsdisplay_addscreendata {