Normalize all the compat hooks' names to the form
<subsystem>_<function>_<version>_hook NFCI XXX Note that although this introduces a change in the kernel-to- XXX module interface, we are NOT bumping the kernel version number. XXX We will bump the version number once the interface stabilizes.
This commit is contained in:
parent
26436013c8
commit
c1283e70fa
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: compat_sysv_50_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: compat_sysv_50_mod.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2018 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: compat_sysv_50_mod.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -75,7 +75,7 @@ compat_sysv_50_modcmd(modcmd_t cmd, void *arg)
|
||||
if (error != 0) {
|
||||
break;
|
||||
}
|
||||
MODULE_SET_HOOK(sysvipc50_sysctl_hook, "sysv50",
|
||||
MODULE_SET_HOOK(sysvipc_sysctl_50_hook, "sysv50",
|
||||
sysctl_kern_sysvipc50);
|
||||
break;
|
||||
|
||||
@ -84,7 +84,7 @@ compat_sysv_50_modcmd(modcmd_t cmd, void *arg)
|
||||
if (error != 0) {
|
||||
break;
|
||||
}
|
||||
MODULE_UNSET_HOOK(sysvipc50_sysctl_hook);
|
||||
MODULE_UNSET_HOOK(sysvipc_sysctl_50_hook);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ieee80211_20.c,v 1.3 2019/01/28 21:13:58 christos Exp $ */
|
||||
/* $NetBSD: ieee80211_20.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 2001 Atsushi Onoe
|
||||
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
|
||||
@ -36,7 +36,7 @@
|
||||
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
|
||||
#endif
|
||||
#ifdef __NetBSD__
|
||||
__KERNEL_RCSID(0, "$NetBSD: ieee80211_20.c,v 1.3 2019/01/28 21:13:58 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ieee80211_20.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -119,12 +119,12 @@ void
|
||||
ieee80211_20_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(ieee80211_20_ioctl_hook, "ieee20", ieee80211_20_ioctl);
|
||||
MODULE_SET_HOOK(ieee80211_ioctl_20_hook, "ieee20", ieee80211_20_ioctl);
|
||||
}
|
||||
|
||||
void
|
||||
ieee80211_20_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(ieee80211_20_ioctl_hook);
|
||||
MODULE_UNSET_HOOK(ieee80211_ioctl_20_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if_43.c,v 1.18 2019/01/29 04:10:10 pgoyette Exp $ */
|
||||
/* $NetBSD: if_43.c,v 1.19 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1982, 1986, 1989, 1990, 1993
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.18 2019/01/29 04:10:10 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.19 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -299,8 +299,8 @@ int
|
||||
if_43_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(if_43_cvtcmd_hook, "if_43", do_compat_cvtcmd);
|
||||
MODULE_SET_HOOK(if_43_ifioctl_hook, "if_43", compat_ifioctl);
|
||||
MODULE_SET_HOOK(if_cvtcmd_43_hook, "if_43", do_compat_cvtcmd);
|
||||
MODULE_SET_HOOK(if_ifioctl_43_hook, "if_43", compat_ifioctl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -308,8 +308,8 @@ int
|
||||
if_43_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(if_43_cvtcmd_hook);
|
||||
MODULE_UNSET_HOOK(if_43_ifioctl_hook);
|
||||
MODULE_UNSET_HOOK(if_cvtcmd_43_hook);
|
||||
MODULE_UNSET_HOOK(if_ifioctl_43_hook);
|
||||
return 0;
|
||||
}
|
||||
#endif /* defined(COMPAT_43) */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rtsock_14.c,v 1.6 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: rtsock_14.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
@ -61,7 +61,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.6 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_14.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -177,14 +177,14 @@ void
|
||||
rtsock_14_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(rtsock_14_oifmsg_hook, "rts_14", compat_14_rt_oifmsg);
|
||||
MODULE_SET_HOOK(rtsock_14_iflist_hook, "rts_14", compat_14_iflist);
|
||||
MODULE_SET_HOOK(rtsock_oifmsg_14_hook, "rts_14", compat_14_rt_oifmsg);
|
||||
MODULE_SET_HOOK(rtsock_iflist_14_hook, "rts_14", compat_14_iflist);
|
||||
}
|
||||
|
||||
void
|
||||
rtsock_14_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(rtsock_14_oifmsg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_14_iflist_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_oifmsg_14_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_iflist_14_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rtsock_50.c,v 1.8 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: rtsock_50.c,v 1.9 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
@ -61,7 +61,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.8 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.9 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#define COMPAT_RTSOCK /* Use the COMPATNAME/COMPATCALL macros and the
|
||||
* various other compat definitions - see
|
||||
@ -153,16 +153,16 @@ void
|
||||
rtsock_50_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(rtsock_50_iflist_hook, "rts_50", compat_50_iflist);
|
||||
MODULE_SET_HOOK(rtsock_50_oifmsg_hook, "rts_50", compat_50_rt_oifmsg);
|
||||
MODULE_SET_HOOK(rtsock_50_rt_missmsg_hook, "rts_50",
|
||||
MODULE_SET_HOOK(rtsock_iflist_50_hook, "rts_50", compat_50_iflist);
|
||||
MODULE_SET_HOOK(rtsock_oifmsg_50_hook, "rts_50", compat_50_rt_oifmsg);
|
||||
MODULE_SET_HOOK(rtsock_rt_missmsg_50_hook, "rts_50",
|
||||
compat_50_rt_missmsg);
|
||||
MODULE_SET_HOOK(rtsock_50_rt_ifmsg_hook, "rts_50", compat_50_rt_ifmsg);
|
||||
MODULE_SET_HOOK(rtsock_50_rt_newaddrmsg_hook, "rts_50",
|
||||
MODULE_SET_HOOK(rtsock_rt_ifmsg_50_hook, "rts_50", compat_50_rt_ifmsg);
|
||||
MODULE_SET_HOOK(rtsock_rt_newaddrmsg_50_hook, "rts_50",
|
||||
compat_50_rt_newaddrmsg);
|
||||
MODULE_SET_HOOK(rtsock_50_rt_ifannouncemsg_hook, "rts_50",
|
||||
MODULE_SET_HOOK(rtsock_rt_ifannouncemsg_50_hook, "rts_50",
|
||||
compat_50_rt_ifannouncemsg);
|
||||
MODULE_SET_HOOK(rtsock_50_rt_ieee80211msg_hook, "rts_50",
|
||||
MODULE_SET_HOOK(rtsock_rt_ieee80211msg_50_hook, "rts_50",
|
||||
compat_50_rt_ieee80211msg);
|
||||
}
|
||||
|
||||
@ -170,11 +170,11 @@ void
|
||||
rtsock_50_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(rtsock_50_iflist_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_50_oifmsg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_50_rt_missmsg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_50_rt_ifmsg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_50_rt_newaddrmsg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_50_rt_ifannouncemsg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_50_rt_ieee80211msg_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_iflist_50_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_oifmsg_50_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_rt_missmsg_50_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_rt_ifmsg_50_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_rt_newaddrmsg_50_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_rt_ifannouncemsg_50_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_rt_ieee80211msg_50_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rtsock_70.c,v 1.3 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: rtsock_70.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.3 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -119,15 +119,15 @@ void
|
||||
rtsock_70_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(rtsock_70_newaddr_hook, "rts_70",
|
||||
MODULE_SET_HOOK(rtsock_newaddr_70_hook, "rts_70",
|
||||
compat_70_rt_newaddrmsg1);
|
||||
MODULE_SET_HOOK(rtsock_70_iflist_hook, "rts_70", compat_70_iflist_addr);
|
||||
MODULE_SET_HOOK(rtsock_iflist_70_hook, "rts_70", compat_70_iflist_addr);
|
||||
}
|
||||
|
||||
void
|
||||
rtsock_70_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(rtsock_70_newaddr_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_70_iflist_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_newaddr_70_hook);
|
||||
MODULE_UNSET_HOOK(rtsock_iflist_70_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tty_43.c,v 1.32 2019/01/28 15:46:49 christos Exp $ */
|
||||
/* $NetBSD: tty_43.c,v 1.33 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008 The NetBSD Foundation, Inc.
|
||||
@ -62,7 +62,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.32 2019/01/28 15:46:49 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty_43.c,v 1.33 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -518,13 +518,13 @@ ttcompatsetlflags(struct tty *tp, struct termios *t)
|
||||
int
|
||||
kern_tty_43_init(void)
|
||||
{
|
||||
MODULE_SET_HOOK(compat_43_ttioctl_hook, "tty_43", compat_43_ttioctl);
|
||||
MODULE_SET_HOOK(tty_ttioctl_43_hook, "tty_43", compat_43_ttioctl);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
kern_tty_43_fini(void)
|
||||
{
|
||||
MODULE_UNSET_HOOK(compat_43_ttioctl_hook);
|
||||
MODULE_UNSET_HOOK(tty_ttioctl_43_hook);
|
||||
return 0;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tty_60.c,v 1.6 2019/01/28 15:46:49 christos Exp $ */
|
||||
/* $NetBSD: tty_60.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2012 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.6 2019/01/28 15:46:49 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty_60.c,v 1.7 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -123,13 +123,13 @@ void
|
||||
kern_tty_60_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(compat_60_ttioctl_hook, "tty_60", compat_60_ttioctl);
|
||||
MODULE_SET_HOOK(compat_60_ptmioctl_hook, "tty_60", compat_60_ptmioctl);
|
||||
MODULE_SET_HOOK(tty_ttioctl_60_hook, "tty_60", compat_60_ttioctl);
|
||||
MODULE_SET_HOOK(tty_ptmioctl_60_hook, "tty_60", compat_60_ptmioctl);
|
||||
}
|
||||
|
||||
void
|
||||
kern_tty_60_fini(void)
|
||||
{
|
||||
MODULE_UNSET_HOOK(compat_60_ttioctl_hook);
|
||||
MODULE_UNSET_HOOK(compat_60_ptmioctl_hook);
|
||||
MODULE_UNSET_HOOK(tty_ttioctl_60_hook);
|
||||
MODULE_UNSET_HOOK(tty_ptmioctl_60_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: uipc_usrreq_70.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: uipc_usrreq_70.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2016 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq_70.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -77,7 +77,7 @@ void
|
||||
uipc_usrreq_70_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(compat_70_unp_hook, "unp_70",
|
||||
MODULE_SET_HOOK(uipc_unp_70_hook, "unp_70",
|
||||
compat_70_unp_addsockcred);
|
||||
}
|
||||
|
||||
@ -85,5 +85,5 @@ void
|
||||
uipc_usrreq_70_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(compat_70_unp_hook);
|
||||
MODULE_UNSET_HOOK(uipc_unp_70_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: usb_subr_30.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: usb_subr_30.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
|
||||
|
||||
/*
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: usb_subr_30.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -232,15 +232,15 @@ void
|
||||
usb_30_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(usb_subr_30_fill_hook, "usb_30",
|
||||
MODULE_SET_HOOK(usb_subr_fill_30_hook, "usb_30",
|
||||
usbd_fill_deviceinfo_old);
|
||||
MODULE_SET_HOOK(usb_subr_30_copy_hook, "usb_30", usb_copy_to_old30);
|
||||
MODULE_SET_HOOK(usb_subr_copy_30_hook, "usb_30", usb_copy_to_old30);
|
||||
}
|
||||
|
||||
void
|
||||
usb_30_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(usb_subr_30_fill_hook);
|
||||
MODULE_UNSET_HOOK(usb_subr_30_copy_hook);
|
||||
MODULE_UNSET_HOOK(usb_subr_fill_30_hook);
|
||||
MODULE_UNSET_HOOK(usb_subr_copy_30_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vfs_syscalls_10.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $ */
|
||||
/* $NetBSD: vfs_syscalls_10.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2018 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_10.c,v 1.2 2019/01/27 02:08:39 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_10.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -55,11 +55,11 @@ real_sys_openat_10(struct pathbuf **pb)
|
||||
void vfs_syscalls_10_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(compat_10_openat_hook, "openat_10", real_sys_openat_10);
|
||||
MODULE_SET_HOOK(vfs_openat_10_hook, "openat_10", real_sys_openat_10);
|
||||
}
|
||||
|
||||
void vfs_syscalls_10_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(compat_10_openat_hook);
|
||||
MODULE_UNSET_HOOK(vfs_openat_10_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netbsd32_compat_50.c,v 1.34 2019/01/27 02:08:40 pgoyette Exp $ */
|
||||
/* $NetBSD: netbsd32_compat_50.c,v 1.35 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008 The NetBSD Foundation, Inc.
|
||||
@ -36,7 +36,7 @@
|
||||
* POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.34 2019/01/27 02:08:40 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.35 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -1044,7 +1044,7 @@ compat_netbsd32_50_modcmd(modcmd_t cmd, void *arg)
|
||||
ret = syscall_establish(&emul_netbsd32,
|
||||
compat_netbsd32_50_syscalls);
|
||||
if (ret == 0)
|
||||
MODULE_SET_HOOK(rnd_ioctl_50_32_hook, "rnd32_50",
|
||||
MODULE_SET_HOOK(rnd_ioctl32_50_hook, "rnd32_50",
|
||||
compat32_50_rnd_ioctl);
|
||||
return ret;
|
||||
|
||||
@ -1052,7 +1052,7 @@ compat_netbsd32_50_modcmd(modcmd_t cmd, void *arg)
|
||||
ret = syscall_disestablish(&emul_netbsd32,
|
||||
compat_netbsd32_50_syscalls);
|
||||
if (ret == 0)
|
||||
MODULE_UNSET_HOOK(rnd_ioctl_50_32_hook);
|
||||
MODULE_UNSET_HOOK(rnd_ioctl32_50_hook);
|
||||
return ret;
|
||||
|
||||
default:
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: netbsd32_kern_proc.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $ */
|
||||
/* $NetBSD: netbsd32_kern_proc.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
|
||||
@ -62,7 +62,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.2 2019/01/27 02:08:40 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: netbsd32_kern_proc.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_kstack.h"
|
||||
@ -139,9 +139,9 @@ netbsd32_kern_proc_32_init(void)
|
||||
{
|
||||
|
||||
#if !defined(_RUMPSERVER)
|
||||
MODULE_SET_HOOK(kern_proc_32_copyin_hook, "kern_proc_32",
|
||||
MODULE_SET_HOOK(kern_proc32_copyin_hook, "kern_proc_32",
|
||||
copyin_psstrings_32);
|
||||
MODULE_SET_HOOK(kern_proc_32_base_hook, "kern_proc_32", get_base32);
|
||||
MODULE_SET_HOOK(kern_proc32_base_hook, "kern_proc_32", get_base32);
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -150,7 +150,7 @@ netbsd32_kern_proc_32_fini(void)
|
||||
{
|
||||
|
||||
#if !defined(_RUMPSERVER)
|
||||
MODULE_UNSET_HOOK(kern_proc_32_copyin_hook);
|
||||
MODULE_UNSET_HOOK(kern_proc_32_base_hook);
|
||||
MODULE_UNSET_HOOK(kern_proc32_copyin_hook);
|
||||
MODULE_UNSET_HOOK(kern_proc32_base_hook);
|
||||
#endif
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rf_compat50.c,v 1.4 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: rf_compat50.c,v 1.5 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2009 The NetBSD Foundation, Inc.
|
||||
@ -244,14 +244,14 @@ void
|
||||
raidframe_50_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(raidframe50_ioctl_hook, "raid50", raidframe_ioctl_50);
|
||||
MODULE_SET_HOOK(raidframe_ioctl_50_hook, "raid50", raidframe_ioctl_50);
|
||||
}
|
||||
|
||||
void
|
||||
raidframe_50_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(raidframe50_ioctl_hook);
|
||||
MODULE_UNSET_HOOK(raidframe_ioctl_50_hook);
|
||||
}
|
||||
|
||||
MODULE(MODULE_CLASS_EXEC, compat_raid_50, "raid,compat_50,compat_raid_80");
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rf_compat80.c,v 1.3 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: rf_compat80.c,v 1.4 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2017 Matthew R. Green
|
||||
@ -269,14 +269,14 @@ void
|
||||
raidframe_80_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(raidframe80_ioctl_hook, "raid80", raidframe_ioctl_80);
|
||||
MODULE_SET_HOOK(raidframe_ioctl_80_hook, "raid80", raidframe_ioctl_80);
|
||||
}
|
||||
|
||||
void
|
||||
raidframe_80_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(raidframe80_ioctl_hook);
|
||||
MODULE_UNSET_HOOK(raidframe_ioctl_80_hook);
|
||||
}
|
||||
|
||||
MODULE(MODULE_CLASS_EXEC, compat_raid_80, "raid,compat_80");
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rf_netbsdkintf.c,v 1.359 2019/01/28 21:14:08 bad Exp $ */
|
||||
/* $NetBSD: rf_netbsdkintf.c,v 1.360 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
|
||||
@ -101,7 +101,7 @@
|
||||
***********************************************************/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.359 2019/01/28 21:14:08 bad Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.360 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -1132,7 +1132,7 @@ raidioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
|
||||
* * If compat code returns EAGAIN, we need to finish via config
|
||||
* * Otherwise the cmd has been handled and we just return
|
||||
*/
|
||||
MODULE_CALL_HOOK(raidframe50_ioctl_hook,
|
||||
MODULE_CALL_HOOK(raidframe_ioctl_50_hook,
|
||||
(cmd, (rs->sc_flags & RAIDF_INITED),raidPtr, unit, data, &k_cfg),
|
||||
enosys(), retcode);
|
||||
if (retcode == ENOSYS)
|
||||
@ -1142,7 +1142,7 @@ raidioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
|
||||
else if (retcode != EPASSTHROUGH)
|
||||
return retcode;
|
||||
|
||||
MODULE_CALL_HOOK(raidframe80_ioctl_hook,
|
||||
MODULE_CALL_HOOK(raidframe_ioctl_80_hook,
|
||||
(cmd, (rs->sc_flags & RAIDF_INITED),raidPtr, unit, data, &k_cfg),
|
||||
enosys(), retcode);
|
||||
if (retcode == ENOSYS)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ugen.c,v 1.142 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: ugen.c,v 1.143 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.142 2019/01/27 02:08:42 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.143 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -1839,7 +1839,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
|
||||
case USB_GET_DEVICEINFO_OLD:
|
||||
{
|
||||
int ret;
|
||||
MODULE_CALL_HOOK(usb_subr_30_fill_hook,
|
||||
MODULE_CALL_HOOK(usb_subr_fill_30_hook,
|
||||
(sc->sc_udev, (struct usb_device_info_old *)addr, 0,
|
||||
usbd_devinfo_vp, usbd_printBCD),
|
||||
enosys(), ret);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: uhid.c,v 1.103 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: uhid.c,v 1.104 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
|
||||
@ -35,7 +35,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.103 2019/01/27 02:08:42 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.104 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -654,7 +654,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, void *addr,
|
||||
(struct usb_device_info *)addr, 0);
|
||||
break;
|
||||
case USB_GET_DEVICEINFO_OLD:
|
||||
MODULE_CALL_HOOK(usb_subr_30_fill_hook,
|
||||
MODULE_CALL_HOOK(usb_subr_fill_30_hook,
|
||||
(sc->sc_hdev.sc_parent->sc_udev,
|
||||
(struct usb_device_info_old *)addr, 0,
|
||||
usbd_devinfo_vp, usbd_printBCD),
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: usb.c,v 1.175 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: usb.c,v 1.176 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998, 2002, 2008, 2012 The NetBSD Foundation, Inc.
|
||||
@ -37,7 +37,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.175 2019/01/27 02:08:42 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.176 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_usb.h"
|
||||
@ -696,7 +696,7 @@ usbread(dev_t dev, struct uio *uio, int flag)
|
||||
mutex_exit(&usb_event_lock);
|
||||
if (!error) {
|
||||
if (useold) { /* copy fields to old struct */
|
||||
MODULE_CALL_HOOK(usb_subr_30_copy_hook,
|
||||
MODULE_CALL_HOOK(usb_subr_copy_30_hook,
|
||||
(ue, ueo, uio), enosys(), error);
|
||||
if (error == ENOSYS)
|
||||
error = EINVAL;
|
||||
@ -877,7 +877,7 @@ usbioctl(dev_t devt, u_long cmd, void *data, int flag, struct lwp *l)
|
||||
error = ENXIO;
|
||||
goto fail;
|
||||
}
|
||||
MODULE_CALL_HOOK(usb_subr_30_fill_hook,
|
||||
MODULE_CALL_HOOK(usb_subr_fill_30_hook,
|
||||
(dev, di, 1, usbd_devinfo_vp, usbd_printBCD),
|
||||
enosys(), error);
|
||||
if (error == ENOSYS)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: wsevent.c,v 1.40 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: wsevent.c,v 1.41 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
|
||||
@ -104,7 +104,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.40 2019/01/27 02:08:42 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.41 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -197,7 +197,7 @@ wsevent_copyout_events(const struct wscons_event *events, int cnt,
|
||||
|
||||
switch (ver) {
|
||||
case 0:
|
||||
MODULE_CALL_HOOK(wsevent_50_copyout_events_hook,
|
||||
MODULE_CALL_HOOK(wscons_copyout_events_50_hook,
|
||||
(events, cnt, uio), enosys(), error);
|
||||
if (error == ENOSYS)
|
||||
error = EINVAL;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: wsevent_50.c,v 1.2 2019/01/27 02:08:42 pgoyette Exp $ */
|
||||
/* $NetBSD: wsevent_50.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
|
||||
@ -104,7 +104,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsevent_50.c,v 1.2 2019/01/27 02:08:42 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsevent_50.c,v 1.3 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
@ -148,7 +148,7 @@ void
|
||||
wsevent_50_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(wsevent_50_copyout_events_hook, "wsc_50",
|
||||
MODULE_SET_HOOK(wscons_copyout_events_50_hook, "wsc_50",
|
||||
wsevent_copyout_events50);
|
||||
}
|
||||
|
||||
@ -156,5 +156,5 @@ void
|
||||
wsevent_50_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(wsevent_50_copyout_events_hook);
|
||||
MODULE_UNSET_HOOK(wscons_copyout_events_50_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: puffs_compat.c,v 1.5 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: puffs_compat.c,v 1.6 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.5 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: puffs_compat.c,v 1.6 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/atomic.h>
|
||||
@ -439,13 +439,13 @@ puffs_compat_incoming(struct puffs_req *preq, struct puffs_req *creq)
|
||||
void puffs_50_init(void)
|
||||
{
|
||||
|
||||
MODULE_SET_HOOK(puffs_50_out_hook, "pffs50", puffs_compat_outgoing);
|
||||
MODULE_SET_HOOK(puffs_50_in_hook, "pffs50", puffs_compat_incoming);
|
||||
MODULE_SET_HOOK(puffs_out_50_hook, "pffs50", puffs_compat_outgoing);
|
||||
MODULE_SET_HOOK(puffs_in_50_hook, "pffs50", puffs_compat_incoming);
|
||||
}
|
||||
|
||||
void puffs_50_fini(void)
|
||||
{
|
||||
|
||||
MODULE_UNSET_HOOK(puffs_50_out_hook);
|
||||
MODULE_UNSET_HOOK(puffs_50_in_hook);
|
||||
MODULE_UNSET_HOOK(puffs_out_50_hook);
|
||||
MODULE_UNSET_HOOK(puffs_in_50_hook);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: puffs_msgif.c,v 1.102 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: puffs_msgif.c,v 1.103 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.102 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.103 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/kernel.h>
|
||||
@ -353,7 +353,7 @@ puffs_msg_enqueue(struct puffs_mount *pmp, struct puffs_msgpark *park)
|
||||
#if 1
|
||||
/* check if we do compat adjustments */
|
||||
if (pmp->pmp_docompat) {
|
||||
MODULE_CALL_HOOK(puffs_50_out_hook, (preq, &creq, &delta),
|
||||
MODULE_CALL_HOOK(puffs_out_50_hook, (preq, &creq, &delta),
|
||||
enosys(), ret);
|
||||
if (ret == 0) {
|
||||
park->park_creq = park->park_preq;
|
||||
@ -813,7 +813,7 @@ puffsop_msg(void *ctx, struct puffs_req *preq)
|
||||
size_t csize;
|
||||
|
||||
KASSERT(pmp->pmp_docompat);
|
||||
MODULE_CALL_VOID_HOOK(puffs_50_in_hook,
|
||||
MODULE_CALL_VOID_HOOK(puffs_in_50_hook,
|
||||
(preq, park->park_creq), __nothing);
|
||||
creq = park->park_creq;
|
||||
csize = park->park_creqlen;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: compat_stub.c,v 1.5 2019/01/29 04:10:10 pgoyette Exp $ */
|
||||
/* $NetBSD: compat_stub.c,v 1.6 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2018 The NetBSD Foundation, Inc.
|
||||
@ -82,8 +82,8 @@ void (*vec_sctp_delete_ip_address)(struct ifaddr *) = NULL;
|
||||
/*
|
||||
* usb device_info compatability
|
||||
*/
|
||||
struct usb_subr_30_fill_hook_t usb_subr_30_fill_hook;
|
||||
struct usb_subr_30_copy_hook_t usb_subr_30_copy_hook;
|
||||
struct usb_subr_fill_30_hook_t usb_subr_fill_30_hook;
|
||||
struct usb_subr_copy_30_hook_t usb_subr_copy_30_hook;
|
||||
|
||||
/*
|
||||
* ccd device compatability ioctl
|
||||
@ -112,15 +112,15 @@ struct ocryptof_50_hook_t ocryptof_50_hook;
|
||||
/*
|
||||
* raidframe compatability
|
||||
*/
|
||||
struct raidframe50_ioctl_hook_t raidframe50_ioctl_hook;
|
||||
struct raidframe80_ioctl_hook_t raidframe80_ioctl_hook;
|
||||
struct raidframe_ioctl_50_hook_t raidframe_ioctl_50_hook;
|
||||
struct raidframe_ioctl_80_hook_t raidframe_ioctl_80_hook;
|
||||
|
||||
/*
|
||||
* puffs compatability
|
||||
*/
|
||||
|
||||
struct puffs_50_out_hook_t puffs_50_out_hook;
|
||||
struct puffs_50_in_hook_t puffs_50_in_hook;
|
||||
struct puffs_out_50_hook_t puffs_out_50_hook;
|
||||
struct puffs_in_50_hook_t puffs_in_50_hook;
|
||||
|
||||
/* XXX
|
||||
int (*puffs50_compat_outgoing)(struct puffs_req *, struct puffs_req **,
|
||||
@ -132,7 +132,7 @@ void (*puffs50_compat_incoming)(struct puffs_req *, struct puffs_req *) =
|
||||
/*
|
||||
* wsevents compatability
|
||||
*/
|
||||
struct wsevent_50_copyout_events_hook_t wsevent_50_copyout_events_hook;
|
||||
struct wscons_copyout_events_50_hook_t wscons_copyout_events_50_hook;
|
||||
|
||||
/*
|
||||
* sysmon_power compatability
|
||||
@ -153,13 +153,13 @@ struct compat_vndioctl_50_hook_t compat_vndioctl_50_hook;
|
||||
/*
|
||||
* ieee80211 ioctl compatability
|
||||
*/
|
||||
struct ieee80211_20_ioctl_hook_t ieee80211_20_ioctl_hook;
|
||||
struct ieee80211_ioctl_20_hook_t ieee80211_ioctl_20_hook;
|
||||
|
||||
/*
|
||||
* if_43 compatability
|
||||
*/
|
||||
struct if_43_cvtcmd_hook_t if_43_cvtcmd_hook;
|
||||
struct if_43_ifioctl_hook_t if_43_ifioctl_hook;
|
||||
struct if_cvtcmd_43_hook_t if_cvtcmd_43_hook;
|
||||
struct if_ifioctl_43_hook_t if_ifioctl_43_hook;
|
||||
|
||||
/*
|
||||
* if43_cvtcmd_20 compatability
|
||||
@ -169,7 +169,7 @@ struct if43_cvtcmd_20_hook_t if43_cvtcmd_20_hook;
|
||||
/*
|
||||
* tty 43 ioctl compatibility
|
||||
*/
|
||||
struct compat_43_ttioctl_hook_t compat_43_ttioctl_hook;
|
||||
struct tty_ttioctl_43_hook_t tty_ttioctl_43_hook;
|
||||
|
||||
/*
|
||||
* uipc_syscalls_40 compatability
|
||||
@ -184,25 +184,25 @@ struct uipc_syscalls_50_hook_t uipc_syscalls_50_hook;
|
||||
/*
|
||||
* rtsock 14 compatability
|
||||
*/
|
||||
struct rtsock_14_oifmsg_hook_t rtsock_14_oifmsg_hook;
|
||||
struct rtsock_14_iflist_hook_t rtsock_14_iflist_hook;
|
||||
struct rtsock_oifmsg_14_hook_t rtsock_oifmsg_14_hook;
|
||||
struct rtsock_iflist_14_hook_t rtsock_iflist_14_hook;
|
||||
|
||||
/*
|
||||
* rtsock 50 compatability
|
||||
*/
|
||||
struct rtsock_50_iflist_hook_t rtsock_50_iflist_hook;
|
||||
struct rtsock_50_oifmsg_hook_t rtsock_50_oifmsg_hook;
|
||||
struct rtsock_50_rt_missmsg_hook_t rtsock_50_rt_missmsg_hook;
|
||||
struct rtsock_50_rt_ifmsg_hook_t rtsock_50_rt_ifmsg_hook;
|
||||
struct rtsock_50_rt_ifannouncemsg_hook_t rtsock_50_rt_ifannouncemsg_hook;
|
||||
struct rtsock_50_rt_newaddrmsg_hook_t rtsock_50_rt_newaddrmsg_hook;
|
||||
struct rtsock_50_rt_ieee80211msg_hook_t rtsock_50_rt_ieee80211msg_hook;
|
||||
struct rtsock_iflist_50_hook_t rtsock_iflist_50_hook;
|
||||
struct rtsock_oifmsg_50_hook_t rtsock_oifmsg_50_hook;
|
||||
struct rtsock_rt_missmsg_50_hook_t rtsock_rt_missmsg_50_hook;
|
||||
struct rtsock_rt_ifmsg_50_hook_t rtsock_rt_ifmsg_50_hook;
|
||||
struct rtsock_rt_ifannouncemsg_50_hook_t rtsock_rt_ifannouncemsg_50_hook;
|
||||
struct rtsock_rt_newaddrmsg_50_hook_t rtsock_rt_newaddrmsg_50_hook;
|
||||
struct rtsock_rt_ieee80211msg_50_hook_t rtsock_rt_ieee80211msg_50_hook;
|
||||
|
||||
/*
|
||||
* rtsock 70 compatability
|
||||
*/
|
||||
struct rtsock_70_newaddr_hook_t rtsock_70_newaddr_hook;
|
||||
struct rtsock_70_iflist_hook_t rtsock_70_iflist_hook;
|
||||
struct rtsock_newaddr_70_hook_t rtsock_newaddr_70_hook;
|
||||
struct rtsock_iflist_70_hook_t rtsock_iflist_70_hook;
|
||||
|
||||
/*
|
||||
* modctl handler for old style OSTAT
|
||||
@ -217,8 +217,8 @@ int kern_sig_43_pgid_mask = ~0;
|
||||
/*
|
||||
* hook for kern_proc_32
|
||||
*/
|
||||
struct kern_proc_32_copyin_hook_t kern_proc_32_copyin_hook;
|
||||
struct kern_proc_32_base_hook_t kern_proc_32_base_hook;
|
||||
struct kern_proc32_copyin_hook_t kern_proc32_copyin_hook;
|
||||
struct kern_proc32_base_hook_t kern_proc32_base_hook;
|
||||
|
||||
/*
|
||||
* Hook for sparc fpu code to check if a process is running
|
||||
@ -230,28 +230,28 @@ struct get_emul_sunos_hook_t get_emul_sunos_hook;
|
||||
* Hook for rnd_ioctl_50 callbacks
|
||||
*/
|
||||
struct rnd_ioctl_50_hook_t rnd_ioctl_50_hook;
|
||||
struct rnd_ioctl_50_32_hook_t rnd_ioctl_50_32_hook;
|
||||
struct rnd_ioctl32_50_hook_t rnd_ioctl32_50_hook;
|
||||
|
||||
/*
|
||||
* Hooks for compat_60 ttioctl and ptmioctl
|
||||
*/
|
||||
struct compat_60_ttioctl_hook_t compat_60_ttioctl_hook;
|
||||
struct compat_60_ptmioctl_hook_t compat_60_ptmioctl_hook;
|
||||
struct tty_ttioctl_60_hook_t tty_ttioctl_60_hook;
|
||||
struct tty_ptmioctl_60_hook_t tty_ptmioctl_60_hook;
|
||||
|
||||
/*
|
||||
* Hook for compat_10 openat
|
||||
*/
|
||||
struct compat_10_openat_hook_t compat_10_openat_hook;
|
||||
struct vfs_openat_10_hook_t vfs_openat_10_hook;
|
||||
|
||||
/*
|
||||
* Hook for compat_70_unp_addsockcred
|
||||
*/
|
||||
struct compat_70_unp_hook_t compat_70_unp_hook;
|
||||
struct uipc_unp_70_hook_t uipc_unp_70_hook;
|
||||
|
||||
/*
|
||||
* Hook for sysvipc50_sysctl
|
||||
*/
|
||||
struct sysvipc50_sysctl_hook_t sysvipc50_sysctl_hook;
|
||||
struct sysvipc_sysctl_50_hook_t sysvipc_sysctl_50_hook;
|
||||
|
||||
/*
|
||||
* Hook for 32-bit machine name
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kern_proc.c,v 1.225 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: kern_proc.c,v 1.226 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
|
||||
@ -62,7 +62,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.225 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.226 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_kstack.h"
|
||||
@ -1899,7 +1899,7 @@ copyin_psstrings(struct proc *p, struct ps_strings *arginfo)
|
||||
int retval;
|
||||
|
||||
if (p->p_flag & PK_32) {
|
||||
MODULE_CALL_HOOK(kern_proc_32_copyin_hook, (p, arginfo),
|
||||
MODULE_CALL_HOOK(kern_proc32_copyin_hook, (p, arginfo),
|
||||
enosys(), retval);
|
||||
return retval;
|
||||
}
|
||||
@ -2115,7 +2115,7 @@ copy_procargs(struct proc *p, int oid, size_t *limit,
|
||||
|
||||
#if !defined(_RUMPKERNEL)
|
||||
if (p->p_flag & PK_32)
|
||||
MODULE_CALL_HOOK(kern_proc_32_base_hook,
|
||||
MODULE_CALL_HOOK(kern_proc32_base_hook,
|
||||
(argv, i++), 0, base);
|
||||
else
|
||||
#endif /* !defined(_RUMPKERNEL) */
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: kern_rndq.c,v 1.91 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: kern_rndq.c,v 1.92 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997-2013 The NetBSD Foundation, Inc.
|
||||
@ -32,7 +32,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.91 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: kern_rndq.c,v 1.92 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/atomic.h>
|
||||
@ -1496,7 +1496,7 @@ rnd_system_ioctl(struct file *fp, u_long cmd, void *addr)
|
||||
enosys(), ret);
|
||||
#if defined(_LP64)
|
||||
if (ret == ENOSYS)
|
||||
MODULE_CALL_HOOK(rnd_ioctl_50_32_hook, (fp, cmd, addr),
|
||||
MODULE_CALL_HOOK(rnd_ioctl32_50_hook, (fp, cmd, addr),
|
||||
enosys(), ret);
|
||||
#endif
|
||||
if (ret == ENOSYS)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: sysv_ipc.c,v 1.35 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: sysv_ipc.c,v 1.36 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 2007 The NetBSD Foundation, Inc.
|
||||
@ -30,7 +30,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.35 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: sysv_ipc.c,v 1.36 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_sysv.h"
|
||||
@ -375,7 +375,7 @@ sysctl_kern_sysvipc(SYSCTLFN_ARGS)
|
||||
* to the non-compat sysctl code.
|
||||
*/
|
||||
|
||||
MODULE_CALL_HOOK(sysvipc50_sysctl_hook, (SYSCTLFN_CALL(rnode)),
|
||||
MODULE_CALL_HOOK(sysvipc_sysctl_50_hook, (SYSCTLFN_CALL(rnode)),
|
||||
stub_sysvipc50_sysctl(SYSCTLFN_CALL(rnode)), error);
|
||||
if (error != EPASSTHROUGH)
|
||||
return error;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tty.c,v 1.279 2019/01/28 15:46:49 christos Exp $ */
|
||||
/* $NetBSD: tty.c,v 1.280 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008 The NetBSD Foundation, Inc.
|
||||
@ -63,7 +63,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.279 2019/01/28 15:46:49 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.280 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -1412,14 +1412,14 @@ ttioctl(struct tty *tp, u_long cmd, void *data, int flag, struct lwp *l)
|
||||
|
||||
/* We may have to load the compat_60 module for this. */
|
||||
(void)module_autoload("compat_60", MODULE_CLASS_EXEC);
|
||||
MODULE_CALL_HOOK(compat_60_ttioctl_hook,
|
||||
MODULE_CALL_HOOK(tty_ttioctl_60_hook,
|
||||
(tp, cmd, data, flag, l), enosys(), error);
|
||||
if (error != EPASSTHROUGH)
|
||||
return error;
|
||||
|
||||
/* We may have to load the compat_43 module for this. */
|
||||
(void)module_autoload("compat_43", MODULE_CLASS_EXEC);
|
||||
MODULE_CALL_HOOK(compat_43_ttioctl_hook,
|
||||
MODULE_CALL_HOOK(tty_ttioctl_43_hook,
|
||||
(tp, cmd, data, flag, l), enosys(), error);
|
||||
return error;
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tty_ptm.c,v 1.38 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: tty_ptm.c,v 1.39 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2004 The NetBSD Foundation, Inc.
|
||||
@ -27,7 +27,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.38 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: tty_ptm.c,v 1.39 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -403,7 +403,7 @@ ptmioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
|
||||
goto bad2;
|
||||
return 0;
|
||||
default:
|
||||
MODULE_CALL_HOOK(compat_60_ptmioctl_hook,
|
||||
MODULE_CALL_HOOK(tty_ptmioctl_60_hook,
|
||||
(dev, cmd, data, flag, l), EPASSTHROUGH, error);
|
||||
if (error != EPASSTHROUGH)
|
||||
return error;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: uipc_usrreq.c,v 1.188 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: uipc_usrreq.c,v 1.189 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
|
||||
@ -96,7 +96,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.188 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.189 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_compat_netbsd.h"
|
||||
@ -350,7 +350,7 @@ unp_output(struct mbuf *m, struct mbuf *control, struct unpcb *unp)
|
||||
if (unp->unp_conn->unp_flags & UNP_WANTCRED)
|
||||
control = unp_addsockcred(curlwp, control);
|
||||
if (unp->unp_conn->unp_flags & UNP_OWANTCRED)
|
||||
MODULE_CALL_HOOK(compat_70_unp_hook, (curlwp, control),
|
||||
MODULE_CALL_HOOK(uipc_unp_70_hook, (curlwp, control),
|
||||
stub_compat_70_unp_addsockcred(curlwp, control), control);
|
||||
if (sbappendaddr(&so2->so_rcv, (const struct sockaddr *)sun, m,
|
||||
control) == 0) {
|
||||
@ -532,7 +532,7 @@ unp_send(struct socket *so, struct mbuf *m, struct sockaddr *nam,
|
||||
* SOCK_STREAM and SOCK_SEQPACKET.
|
||||
*/
|
||||
unp->unp_conn->unp_flags &= ~UNP_OWANTCRED;
|
||||
MODULE_CALL_HOOK(compat_70_unp_hook, (curlwp, control),
|
||||
MODULE_CALL_HOOK(uipc_unp_70_hook, (curlwp, control),
|
||||
stub_compat_70_unp_addsockcred(curlwp, control),
|
||||
control);
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: vfs_syscalls.c,v 1.519 2019/01/27 02:08:43 pgoyette Exp $ */
|
||||
/* $NetBSD: vfs_syscalls.c,v 1.520 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
|
||||
@ -70,7 +70,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.519 2019/01/27 02:08:43 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.520 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_fileassoc.h"
|
||||
@ -1634,8 +1634,7 @@ do_sys_openat(lwp_t *l, int fdat, const char *path, int flags,
|
||||
int error;
|
||||
|
||||
if (path == NULL) {
|
||||
MODULE_CALL_HOOK(compat_10_openat_hook, (&pb),
|
||||
0, error);
|
||||
MODULE_CALL_HOOK(vfs_openat_10_hook, (&pb), 0, error);
|
||||
if (error)
|
||||
return error;
|
||||
} else {
|
||||
|
10
sys/net/if.c
10
sys/net/if.c
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: if.c,v 1.444 2019/01/27 02:08:48 pgoyette Exp $ */
|
||||
/* $NetBSD: if.c,v 1.445 2019/01/29 09:28:50 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
|
||||
@ -90,7 +90,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.444 2019/01/27 02:08:48 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.445 2019/01/29 09:28:50 pgoyette Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_inet.h"
|
||||
@ -3153,7 +3153,7 @@ doifioctl(struct socket *so, u_long cmd, void *data, struct lwp *l)
|
||||
}
|
||||
|
||||
ifr = data;
|
||||
MODULE_CALL_HOOK(if_43_cvtcmd_hook, (&cmd, ocmd), enosys(), hook);
|
||||
MODULE_CALL_HOOK(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
|
||||
if (hook != ENOSYS) {
|
||||
if (cmd != ocmd) {
|
||||
oifr = data;
|
||||
@ -3254,7 +3254,7 @@ doifioctl(struct socket *so, u_long cmd, void *data, struct lwp *l)
|
||||
error = EOPNOTSUPP;
|
||||
else {
|
||||
KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
|
||||
MODULE_CALL_HOOK(if_43_ifioctl_hook,
|
||||
MODULE_CALL_HOOK(if_ifioctl_43_hook,
|
||||
(so, ocmd, cmd, data, l), enosys(), error);
|
||||
if (error == ENOSYS)
|
||||
error = (*so->so_proto->pr_usrreqs->pr_ioctl)(so,
|
||||
@ -3410,7 +3410,7 @@ ifreq_setaddr(u_long cmd, struct ifreq *ifr, const struct sockaddr *sa)
|
||||
u_long ocmd = cmd;
|
||||
int hook;
|
||||
|
||||
MODULE_CALL_HOOK(if_43_cvtcmd_hook, (&cmd, ocmd), enosys(), hook);
|
||||
MODULE_CALL_HOOK(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
|
||||
if (hook != ENOSYS) {
|
||||
if (cmd != ocmd) {
|
||||
oifr = (struct oifreq *)(void *)ifr;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rtsock.c,v 1.245 2019/01/27 02:08:48 pgoyette Exp $ */
|
||||
/* $NetBSD: rtsock.c,v 1.246 2019/01/29 09:28:51 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
@ -61,7 +61,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.245 2019/01/27 02:08:48 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.246 2019/01/29 09:28:51 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_inet.h"
|
||||
@ -324,7 +324,7 @@ sysctl_iflist(int af, struct rt_walkarg *w, int type)
|
||||
if (w->w_where && w->w_tmem && w->w_needed <= 0) {
|
||||
switch (type) {
|
||||
case NET_RT_OIFLIST: /* old _70 */
|
||||
if (!rtsock_70_iflist_hook.hooked) {
|
||||
if (!rtsock_iflist_70_hook.hooked) {
|
||||
error = EINVAL;
|
||||
break;
|
||||
}
|
||||
@ -333,11 +333,11 @@ sysctl_iflist(int af, struct rt_walkarg *w, int type)
|
||||
error = sysctl_iflist_if(ifp, w, &info, len);
|
||||
break;
|
||||
case NET_RT_OOIFLIST: /* old _50 */
|
||||
MODULE_CALL_HOOK(rtsock_50_iflist_hook,
|
||||
MODULE_CALL_HOOK(rtsock_iflist_50_hook,
|
||||
(ifp, w, &info, len), enosys(), error);
|
||||
break;
|
||||
case NET_RT_OOOIFLIST: /* old _14 */
|
||||
MODULE_CALL_HOOK(rtsock_14_iflist_hook,
|
||||
MODULE_CALL_HOOK(rtsock_iflist_14_hook,
|
||||
(ifp, w, &info, len), enosys(), error);
|
||||
break;
|
||||
default:
|
||||
@ -367,7 +367,7 @@ sysctl_iflist(int af, struct rt_walkarg *w, int type)
|
||||
case NET_RT_OIFLIST:
|
||||
case NET_RT_OOIFLIST:
|
||||
case NET_RT_OOOIFLIST:
|
||||
MODULE_CALL_HOOK(rtsock_70_iflist_hook,
|
||||
MODULE_CALL_HOOK(rtsock_iflist_70_hook,
|
||||
(w, ifa, &info), enosys(), error);
|
||||
break;
|
||||
default:
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: rtsock_shared.c,v 1.2 2019/01/27 02:08:48 pgoyette Exp $ */
|
||||
/* $NetBSD: rtsock_shared.c,v 1.3 2019/01/29 09:28:51 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
||||
@ -61,7 +61,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.2 2019/01/27 02:08:48 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.3 2019/01/29 09:28:51 pgoyette Exp $");
|
||||
|
||||
#ifdef _KERNEL_OPT
|
||||
#include "opt_inet.h"
|
||||
@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.2 2019/01/27 02:08:48 pgoyette E
|
||||
#define COMPATNAME(x) compat_50_ ## x
|
||||
#define DOMAINNAME "oroute"
|
||||
#define COMPATCALL(name, args) \
|
||||
MODULE_CALL_VOID_HOOK(rtsock_50_ ## name ## _hook, args, __nothing);
|
||||
MODULE_CALL_VOID_HOOK(rtsock_ ## name ## _50_hook, args, __nothing);
|
||||
#define RTS_CTASSERT(x) __nothing
|
||||
CTASSERT(sizeof(struct ifa_xmsghdr) == 20);
|
||||
DOMAIN_DEFINE(compat_50_routedomain); /* forward declare and add to link set */
|
||||
@ -1108,7 +1108,7 @@ rt_getlen(int type)
|
||||
case RTM_ODELADDR:
|
||||
case RTM_ONEWADDR:
|
||||
case RTM_OCHGADDR:
|
||||
if (rtsock_70_iflist_hook.hooked)
|
||||
if (rtsock_iflist_70_hook.hooked)
|
||||
return sizeof(struct ifa_msghdr70);
|
||||
else {
|
||||
#ifdef RTSOCK_DEBUG
|
||||
@ -1123,7 +1123,7 @@ rt_getlen(int type)
|
||||
return sizeof(struct ifa_xmsghdr);
|
||||
|
||||
case RTM_OOIFINFO:
|
||||
if (rtsock_14_iflist_hook.hooked)
|
||||
if (rtsock_iflist_14_hook.hooked)
|
||||
return sizeof(struct if_msghdr14);
|
||||
else {
|
||||
#ifdef RTSOCK_DEBUG
|
||||
@ -1134,7 +1134,7 @@ rt_getlen(int type)
|
||||
}
|
||||
|
||||
case RTM_OIFINFO:
|
||||
if (rtsock_50_iflist_hook.hooked)
|
||||
if (rtsock_iflist_50_hook.hooked)
|
||||
return sizeof(struct if_msghdr50);
|
||||
else {
|
||||
#ifdef RTSOCK_DEBUG
|
||||
@ -1350,8 +1350,8 @@ COMPATNAME(rt_ifmsg)(struct ifnet *ifp)
|
||||
if (m == NULL)
|
||||
return;
|
||||
COMPATNAME(route_enqueue)(m, 0);
|
||||
MODULE_CALL_VOID_HOOK(rtsock_14_oifmsg_hook, (ifp), __nothing);
|
||||
MODULE_CALL_VOID_HOOK(rtsock_50_oifmsg_hook, (ifp), __nothing);
|
||||
MODULE_CALL_VOID_HOOK(rtsock_oifmsg_14_hook, (ifp), __nothing);
|
||||
MODULE_CALL_VOID_HOOK(rtsock_oifmsg_50_hook, (ifp), __nothing);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1419,7 +1419,7 @@ COMPATNAME(rt_newaddrmsg)(int cmd, struct ifaddr *ifa, int error,
|
||||
default:
|
||||
panic("%s: unknown command %d", __func__, cmd);
|
||||
}
|
||||
MODULE_CALL_VOID_HOOK(rtsock_70_newaddr_hook,
|
||||
MODULE_CALL_VOID_HOOK(rtsock_newaddr_70_hook,
|
||||
(ncmd, ifa), __nothing);
|
||||
info.rti_info[RTAX_IFA] = sa = ifa->ifa_addr;
|
||||
KASSERT(ifp->if_dl != NULL);
|
||||
|
@ -36,7 +36,7 @@
|
||||
__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
|
||||
#endif
|
||||
#ifdef __NetBSD__
|
||||
__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.62 2019/01/28 21:13:58 christos Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.63 2019/01/29 09:28:51 pgoyette Exp $");
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -2853,7 +2853,7 @@ ieee80211_ioctl(struct ieee80211com *ic, u_long cmd, void *data)
|
||||
case OSIOCG80211STATS:
|
||||
case OSIOCG80211ZSTATS:
|
||||
(void)module_autoload("compat_20", MODULE_CLASS_EXEC);
|
||||
MODULE_CALL_HOOK(ieee80211_20_ioctl_hook, (ic, cmd, data),
|
||||
MODULE_CALL_HOOK(ieee80211_ioctl_20_hook, (ic, cmd, data),
|
||||
enosys(), error);
|
||||
break;
|
||||
case SIOCG80211ZSTATS:
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: compat_stub.h,v 1.7 2019/01/29 04:54:42 pgoyette Exp $ */
|
||||
/* $NetBSD: compat_stub.h,v 1.8 2019/01/29 09:28:51 pgoyette Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2018 The NetBSD Foundation, Inc.
|
||||
@ -84,11 +84,11 @@ struct usb_device_info_old;
|
||||
struct usb_event;
|
||||
struct usb_event_old;
|
||||
struct uio;
|
||||
MODULE_HOOK(usb_subr_30_fill_hook, int,
|
||||
MODULE_HOOK(usb_subr_fill_30_hook, int,
|
||||
(struct usbd_device *, struct usb_device_info_old *, int,
|
||||
void (*)(struct usbd_device *, char *, size_t, char *, size_t, int, int),
|
||||
int (*)(char *, size_t, int)));
|
||||
MODULE_HOOK(usb_subr_30_copy_hook, int,
|
||||
MODULE_HOOK(usb_subr_copy_30_hook, int,
|
||||
(struct usb_event *, struct usb_event_old *, struct uio *));
|
||||
|
||||
/*
|
||||
@ -130,9 +130,9 @@ MODULE_HOOK(ocryptof_50_hook, int, (struct file *, u_long, void *));
|
||||
|
||||
struct RF_Config_s;
|
||||
struct RF_Raid_s;
|
||||
MODULE_HOOK(raidframe50_ioctl_hook, int,
|
||||
MODULE_HOOK(raidframe_ioctl_50_hook, int,
|
||||
(int, int, struct RF_Raid_s *, int, void *, struct RF_Config_s **));
|
||||
MODULE_HOOK(raidframe80_ioctl_hook, int,
|
||||
MODULE_HOOK(raidframe_ioctl_80_hook, int,
|
||||
(int, int, struct RF_Raid_s *, int, void *, struct RF_Config_s **));
|
||||
|
||||
/*
|
||||
@ -140,9 +140,9 @@ MODULE_HOOK(raidframe80_ioctl_hook, int,
|
||||
*/
|
||||
|
||||
struct puffs_req;
|
||||
MODULE_HOOK(puffs_50_out_hook, int,
|
||||
MODULE_HOOK(puffs_out_50_hook, int,
|
||||
(struct puffs_req *, struct puffs_req **, ssize_t *)); /* outgoing */
|
||||
MODULE_HOOK(puffs_50_in_hook, void,
|
||||
MODULE_HOOK(puffs_in_50_hook, void,
|
||||
(struct puffs_req *, struct puffs_req *)); /* incoming */
|
||||
|
||||
/*
|
||||
@ -151,7 +151,7 @@ MODULE_HOOK(puffs_50_in_hook, void,
|
||||
|
||||
struct wscons_event;
|
||||
struct uio;
|
||||
MODULE_HOOK(wsevent_50_copyout_events_hook, int,
|
||||
MODULE_HOOK(wscons_copyout_events_50_hook, int,
|
||||
(const struct wscons_event *, int, struct uio *));
|
||||
|
||||
/*
|
||||
@ -189,7 +189,7 @@ MODULE_HOOK(compat_vndioctl_50_hook, int, (u_long, struct lwp *, void *, int,
|
||||
*/
|
||||
struct ieee80211com;
|
||||
|
||||
MODULE_HOOK(ieee80211_20_ioctl_hook, int,
|
||||
MODULE_HOOK(ieee80211_ioctl_20_hook, int,
|
||||
(struct ieee80211com *, u_long, void *));
|
||||
|
||||
/*
|
||||
@ -197,8 +197,8 @@ MODULE_HOOK(ieee80211_20_ioctl_hook, int,
|
||||
*/
|
||||
struct socket;
|
||||
|
||||
MODULE_HOOK(if_43_cvtcmd_hook, int, (u_long *, u_long));
|
||||
MODULE_HOOK(if_43_ifioctl_hook, int,
|
||||
MODULE_HOOK(if_cvtcmd_43_hook, int, (u_long *, u_long));
|
||||
MODULE_HOOK(if_ifioctl_43_hook, int,
|
||||
(struct socket *, u_long, u_long, void *, struct lwp *));
|
||||
|
||||
/*
|
||||
@ -211,7 +211,7 @@ MODULE_HOOK(if43_cvtcmd_20_hook, int, (u_long));
|
||||
*/
|
||||
struct tty;
|
||||
|
||||
MODULE_HOOK(compat_43_ttioctl_hook, int,
|
||||
MODULE_HOOK(tty_ttioctl_43_hook, int,
|
||||
(struct tty *, u_long, void *, int, struct lwp *));
|
||||
|
||||
/*
|
||||
@ -232,8 +232,8 @@ MODULE_HOOK(uipc_syscalls_50_hook, int, (struct lwp *, u_long, void *));
|
||||
struct ifnet;
|
||||
struct rt_walkarg;
|
||||
struct rt_addrinfo;
|
||||
MODULE_HOOK(rtsock_14_oifmsg_hook, void, (struct ifnet *));
|
||||
MODULE_HOOK(rtsock_14_iflist_hook, int,
|
||||
MODULE_HOOK(rtsock_oifmsg_14_hook, void, (struct ifnet *));
|
||||
MODULE_HOOK(rtsock_iflist_14_hook, int,
|
||||
(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *, size_t));
|
||||
|
||||
/*
|
||||
@ -242,24 +242,24 @@ MODULE_HOOK(rtsock_14_iflist_hook, int,
|
||||
|
||||
struct rtentry;
|
||||
struct ifaddr;
|
||||
MODULE_HOOK(rtsock_50_oifmsg_hook, void, (struct ifnet *));
|
||||
MODULE_HOOK(rtsock_50_iflist_hook, int,
|
||||
MODULE_HOOK(rtsock_oifmsg_50_hook, void, (struct ifnet *));
|
||||
MODULE_HOOK(rtsock_iflist_50_hook, int,
|
||||
(struct ifnet *, struct rt_walkarg *, struct rt_addrinfo *, size_t));
|
||||
MODULE_HOOK(rtsock_50_rt_missmsg_hook, void,
|
||||
MODULE_HOOK(rtsock_rt_missmsg_50_hook, void,
|
||||
(int, const struct rt_addrinfo *, int, int));
|
||||
MODULE_HOOK(rtsock_50_rt_ifmsg_hook, void, (struct ifnet *));
|
||||
MODULE_HOOK(rtsock_50_rt_newaddrmsg_hook, void,
|
||||
MODULE_HOOK(rtsock_rt_ifmsg_50_hook, void, (struct ifnet *));
|
||||
MODULE_HOOK(rtsock_rt_newaddrmsg_50_hook, void,
|
||||
(int, struct ifaddr *, int, struct rtentry *));
|
||||
MODULE_HOOK(rtsock_50_rt_ifannouncemsg_hook, void, (struct ifnet *, int));
|
||||
MODULE_HOOK(rtsock_50_rt_ieee80211msg_hook, void,
|
||||
MODULE_HOOK(rtsock_rt_ifannouncemsg_50_hook, void, (struct ifnet *, int));
|
||||
MODULE_HOOK(rtsock_rt_ieee80211msg_50_hook, void,
|
||||
(struct ifnet *, int, void *, size_t));
|
||||
|
||||
/*
|
||||
* Hooks for rtsock_70
|
||||
*/
|
||||
struct ifaddr;
|
||||
MODULE_HOOK(rtsock_70_newaddr_hook, void, (int, struct ifaddr *));
|
||||
MODULE_HOOK(rtsock_70_iflist_hook, int,
|
||||
MODULE_HOOK(rtsock_newaddr_70_hook, void, (int, struct ifaddr *));
|
||||
MODULE_HOOK(rtsock_iflist_70_hook, int,
|
||||
(struct rt_walkarg *, struct ifaddr *, struct rt_addrinfo *));
|
||||
|
||||
/*
|
||||
@ -277,9 +277,9 @@ extern int kern_sig_43_pgid_mask;
|
||||
* Hooks for kern_proc.c for netbsd32 compat
|
||||
*/
|
||||
struct ps_strings;
|
||||
MODULE_HOOK(kern_proc_32_copyin_hook, int,
|
||||
MODULE_HOOK(kern_proc32_copyin_hook, int,
|
||||
(struct proc *, struct ps_strings *));
|
||||
MODULE_HOOK(kern_proc_32_base_hook, vaddr_t, (char **, size_t));
|
||||
MODULE_HOOK(kern_proc32_base_hook, vaddr_t, (char **, size_t));
|
||||
|
||||
/*
|
||||
* Hook to allow sparc fpu code to see if a process is using sunos
|
||||
@ -292,34 +292,34 @@ MODULE_HOOK(get_emul_sunos_hook, int, (const struct emul **));
|
||||
* Hooks for rnd_ioctl_50
|
||||
*/
|
||||
MODULE_HOOK(rnd_ioctl_50_hook, int, (struct file *, u_long, void *));
|
||||
MODULE_HOOK(rnd_ioctl_50_32_hook, int, (struct file *, u_long, void *));
|
||||
MODULE_HOOK(rnd_ioctl32_50_hook, int, (struct file *, u_long, void *));
|
||||
|
||||
/*
|
||||
* Hooks for compat_60 ttioctl and ptmioctl
|
||||
*/
|
||||
MODULE_HOOK(compat_60_ttioctl_hook, int,
|
||||
MODULE_HOOK(tty_ttioctl_60_hook, int,
|
||||
(struct tty *, u_long, void *, int, struct lwp *));
|
||||
MODULE_HOOK(compat_60_ptmioctl_hook, int,
|
||||
MODULE_HOOK(tty_ptmioctl_60_hook, int,
|
||||
(dev_t, u_long, void *, int, struct lwp *));
|
||||
|
||||
/*
|
||||
* Hook for compat_10 openat
|
||||
*/
|
||||
struct pathbuf;
|
||||
MODULE_HOOK(compat_10_openat_hook, int, (struct pathbuf **));
|
||||
MODULE_HOOK(vfs_openat_10_hook, int, (struct pathbuf **));
|
||||
|
||||
/*
|
||||
* Hook for compat_70_unp_addsockcred
|
||||
*/
|
||||
struct mbuf;
|
||||
MODULE_HOOK(compat_70_unp_hook, struct mbuf *,
|
||||
MODULE_HOOK(uipc_unp_70_hook, struct mbuf *,
|
||||
(struct lwp *, struct mbuf *));
|
||||
|
||||
/*
|
||||
* Hook for sysvipc50 sysctl
|
||||
*/
|
||||
#include <sys/sysctl.h>
|
||||
MODULE_HOOK(sysvipc50_sysctl_hook, int, (SYSCTLFN_PROTO));
|
||||
MODULE_HOOK(sysvipc_sysctl_50_hook, int, (SYSCTLFN_PROTO));
|
||||
|
||||
/*
|
||||
* Hook for 32-bit machine name
|
||||
|
Loading…
Reference in New Issue
Block a user