Source-Changes-HG archive

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

[src/trunk]: src/sys/compat/netbsd32 Add missing SIOCGDRVSPEC32



details:   https://anonhg.NetBSD.org/src/rev/aa914393aaff
branches:  trunk
changeset: 808638:aa914393aaff
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 27 21:42:43 2015 +0000

description:
Add missing SIOCGDRVSPEC32
Fix SIOCGETSGCNT32

diffstat:

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

diffs (59 lines):

diff -r 0a894654e359 -r aa914393aaff sys/compat/netbsd32/netbsd32_ioctl.c
--- a/sys/compat/netbsd32/netbsd32_ioctl.c      Wed May 27 21:27:03 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c      Wed May 27 21:42:43 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.c,v 1.72 2015/05/20 04:37:45 matt Exp $ */
+/*     $NetBSD: netbsd32_ioctl.c,v 1.73 2015/05/27 21:42:43 matt 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.72 2015/05/20 04:37:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.73 2015/05/27 21:42:43 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1041,6 +1041,8 @@
 
        case SIOCSDRVSPEC32:
                IOCTL_STRUCT_CONV_TO(SIOCSDRVSPEC, ifdrv);
+       case SIOCGDRVSPEC32:
+               IOCTL_STRUCT_CONV_TO(SIOCGDRVSPEC, ifdrv);
 
        case SIOCGETVIFCNT32:
                IOCTL_STRUCT_CONV_TO(SIOCGETVIFCNT, sioc_vif_req);
diff -r 0a894654e359 -r aa914393aaff sys/compat/netbsd32/netbsd32_ioctl.h
--- a/sys/compat/netbsd32/netbsd32_ioctl.h      Wed May 27 21:27:03 2015 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.h      Wed May 27 21:42:43 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.h,v 1.48 2015/05/20 07:24:49 matt Exp $ */
+/*     $NetBSD: netbsd32_ioctl.h,v 1.49 2015/05/27 21:42:43 matt Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -434,7 +434,8 @@
        netbsd32_voidp  ifd_data;
 };
 /* from <sys/sockio.h> */
-#define SIOCSDRVSPEC32 _IOW('i', 123, struct netbsd32_ifdrv)   /* set driver-specific */
+#define SIOCSDRVSPEC32 _IOW('i', 123, struct netbsd32_ifdrv)   /* set driver-specific */
+#define SIOCGDRVSPEC32 _IOWR('i', 123, struct netbsd32_ifdrv)  /* get driver-specific */
 
 /* from <netinet/ip_mroute.h> */
 struct netbsd32_sioc_vif_req {
@@ -450,9 +451,9 @@
 struct netbsd32_sioc_sg_req {
        struct  in_addr src;
        struct  in_addr grp;
-       u_long  pktcnt;
-       u_long  bytecnt;
-       u_long  wrong_if;
+       netbsd32_u_long pktcnt;
+       netbsd32_u_long bytecnt;
+       netbsd32_u_long wrong_if;
 };
 /* from <sys/sockio.h> */
 #define        SIOCGETSGCNT32  _IOWR('u', 52, struct netbsd32_sioc_sg_req) /* sg pkt cnt */



Home | Main Index | Thread Index | Old Index