[src/trunk]: src/sys/compat/netbsd32 PR/53666: Rin Okuyama: tcpdump for i386 ...

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

details:   https://anonhg.NetBSD.org/src/rev/608825ad99d8
branches:  trunk
changeset: 433901:608825ad99d8
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Oct 11 15:23:22 2018 +0000

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

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 111daa00c9b7 -r 608825ad99d8 sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Thu Oct 11 11:17:07 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Thu Oct 11 15:23:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.c,v 1.97 2018/10/06 15:22:16 christos Exp $     */
+/*     $NetBSD: netbsd32_ioctl.c,v 1.98 2018/10/11 15:23:22 christos 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.97 2018/10/06 15:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.98 2018/10/11 15:23:22 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
@@ -1345,6 +1345,12 @@
                IOCTL_STRUCT_CONV_TO(BIOCSUDPF, bpf_program);
        case BIOCGDLTLIST32:
                IOCTL_STRUCT_CONV_TO(BIOCGDLTLIST, bpf_dltlist);
+       case BIOCSRTIMEOUT32:
+#define netbsd32_to_timeval(p, s32p, cmd) netbsd32_to_timeval(p, s32p)
+#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 111daa00c9b7 -r 608825ad99d8 sys/compat/netbsd32/netbsd32_ioctl.h
--- a/sys/compat/netbsd32/netbsd32_ioctl.h      Thu Oct 11 11:17:07 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.h      Thu Oct 11 15:23:22 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.h,v 1.64 2018/09/29 14:41:35 rmind Exp $        */
+/*     $NetBSD: netbsd32_ioctl.h,v 1.65 2018/10/11 15:23:22 christos 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 {