Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fallout from the interface ioctl changes:

Browse Source 
OSIOCGIFADDR -> OOSIOCGIFADDR
OSIOCGIFDSTADDR -> OOSIOCGIFDSTADDR
OSIOCGIFNETMASK -> OOSIOCGIFNETMASK

Also, one instance of needing to include <net/if.h> before
<compat/sys/sockio.h> due to use of IFNAMSIZ in the latter.

Discussed with christos.
This commit is contained in:
he 2007-06-01 11:36:35 +00:00
parent d3eeea012e
commit 8f77cc1c43
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/compat/sunos/sunos_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sunos_ioctl.c,v 1.55 2007/05/29 21:32:28 christos Exp $ */
/* $NetBSD: sunos_ioctl.c,v 1.56 2007/06/01 11:36:35 he Exp $ */
/*
* Copyright (c) 1993 Markus Wild.
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.55 2007/05/29 21:32:28 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.56 2007/06/01 11:36:35 he Exp $");
#if defined(_KERNEL_OPT)
#include "opt_execfmt.h"
@ -50,10 +50,10 @@ __KERNEL_RCSID(0, "$NetBSD: sunos_ioctl.c,v 1.55 2007/05/29 21:32:28 christos Ex
#include <miscfs/specfs/specdev.h>
#include <compat/sys/sockio.h>
#include <net/if.h>
#include <compat/sys/sockio.h>
#include <dev/sun/disklabel.h>
#include <compat/sunos/sunos.h>
@ -665,10 +665,10 @@ sunos_sys_ioctl(l, v, retval)
break;
case _IOWR('i', 13, struct oifreq):
IFREQ_INOUT(OSIOCGIFADDR);
IFREQ_INOUT(OOSIOCGIFADDR);
case _IOWR('i', 15, struct oifreq):
IFREQ_INOUT(OSIOCGIFDSTADDR);
IFREQ_INOUT(OOSIOCGIFDSTADDR);
case _IOW('i', 21, struct oifreq):
IFREQ_IN(SIOCSIFMTU);
@ -683,7 +683,7 @@ sunos_sys_ioctl(l, v, retval)
IFREQ_IN(SIOCSIFBRDADDR);
case _IOWR('i', 25, struct oifreq):
IFREQ_INOUT(OSIOCGIFNETMASK);
IFREQ_INOUT(OOSIOCGIFNETMASK);
case _IOW('i', 26, struct oifreq):
IFREQ_IN(SIOCSIFNETMASK);

11
sys/compat/ultrix/ultrix_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ultrix_ioctl.c,v 1.30 2007/05/29 21:32:29 christos Exp $ */
/* $NetBSD: ultrix_ioctl.c,v 1.31 2007/06/01 11:36:35 he Exp $ */
/* from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */
/*
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.30 2007/05/29 21:32:29 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.31 2007/06/01 11:36:35 he Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_ultrix.h"
@ -49,6 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: ultrix_ioctl.c,v 1.30 2007/05/29 21:32:29 christos E
#include <sys/mount.h>
#include <compat/sys/sockio.h>
#include <compat/ultrix/ultrix_syscallargs.h>
#include <sys/syscallargs.h>
@ -666,14 +667,14 @@ ultrix_sys_ioctl(struct lwp *l, void *v, register_t *retval)
break;
case _IOWR('i', 13, struct oifreq):
IFREQ_INOUT(OSIOCGIFADDR);
IFREQ_INOUT(OOSIOCGIFADDR);
case _IOW('i', 14, struct oifreq):
/* SIOCSIFDSTADDR */
break;
case _IOWR('i', 15, struct oifreq):
IFREQ_INOUT(OSIOCGIFDSTADDR);
IFREQ_INOUT(OOSIOCGIFDSTADDR);
case _IOW('i', 16, struct oifreq):
/* SIOCSIFFLAGS */
@ -709,7 +710,7 @@ ultrix_sys_ioctl(struct lwp *l, void *v, register_t *retval)
case _IOWR('i', 21, struct oifreq):
IFREQ_INOUT(OSIOCGIFNETMASK);
IFREQ_INOUT(OOSIOCGIFNETMASK);
case _IOW('i', 22, struct oifreq):
IFREQ_IN(SIOCSIFNETMASK);