Module Name: src
Committed By: pgoyette
Date: Mon Apr 29 08:31:29 UTC 2019
Modified Files:
src/sys/compat/common: rtsock_50.c rtsock_70.c
Log Message:
Move the set-up of the net.oroute... sysctl tree to compat_50 since
the new AF_ROUTE was introduced in NetBSD-6.0
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/compat/common/rtsock_50.c
cvs rdiff -u -r1.6 -r1.7 src/sys/compat/common/rtsock_70.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/rtsock_50.c
diff -u src/sys/compat/common/rtsock_50.c:1.10 src/sys/compat/common/rtsock_50.c:1.11
--- src/sys/compat/common/rtsock_50.c:1.10 Fri Mar 1 11:06:56 2019
+++ src/sys/compat/common/rtsock_50.c Mon Apr 29 08:31:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_50.c,v 1.10 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: rtsock_50.c,v 1.11 2019/04/29 08:31:29 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.10 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,v 1.11 2019/04/29 08:31:29 pgoyette Exp $");
#define COMPAT_RTSOCK /* Use the COMPATNAME/COMPATCALL macros and the
* various other compat definitions - see
@@ -71,6 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_50.c,
#include <net/rtsock_shared.c>
#include <compat/net/route_50.h>
+struct sysctllog *clog;
+
void
compat_50_rt_oifmsg(struct ifnet *ifp)
{
@@ -164,12 +166,14 @@ rtsock_50_init(void)
compat_50_rt_ifannouncemsg);
MODULE_HOOK_SET(rtsock_rt_ieee80211msg_50_hook, "rts_50",
compat_50_rt_ieee80211msg);
+ sysctl_net_route_setup(&clog, PF_OROUTE, "ortable");
}
void
rtsock_50_fini(void)
{
+ sysctl_teardown(&clog);
MODULE_HOOK_UNSET(rtsock_iflist_50_hook);
MODULE_HOOK_UNSET(rtsock_oifmsg_50_hook);
MODULE_HOOK_UNSET(rtsock_rt_missmsg_50_hook);
Index: src/sys/compat/common/rtsock_70.c
diff -u src/sys/compat/common/rtsock_70.c:1.6 src/sys/compat/common/rtsock_70.c:1.7
--- src/sys/compat/common/rtsock_70.c:1.6 Mon Apr 29 05:42:09 2019
+++ src/sys/compat/common/rtsock_70.c Mon Apr 29 08:31:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsock_70.c,v 1.6 2019/04/29 05:42:09 pgoyette Exp $ */
+/* $NetBSD: rtsock_70.c,v 1.7 2019/04/29 08:31:29 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.6 2019/04/29 05:42:09 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,v 1.7 2019/04/29 08:31:29 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: rtsock_70.c,
#include <compat/net/route.h>
#include <compat/net/route_70.h>
-struct sysctllog *clog;
-
void
compat_70_rt_newaddrmsg1(int cmd, struct ifaddr *ifa)
{
@@ -124,14 +122,12 @@ rtsock_70_init(void)
MODULE_HOOK_SET(rtsock_newaddr_70_hook, "rts_70",
compat_70_rt_newaddrmsg1);
MODULE_HOOK_SET(rtsock_iflist_70_hook, "rts_70", compat_70_iflist_addr);
- sysctl_net_route_setup(&clog, PF_OROUTE, "ortable");
}
void
rtsock_70_fini(void)
{
- sysctl_teardown(&clog);
MODULE_HOOK_UNSET(rtsock_newaddr_70_hook);
MODULE_HOOK_UNSET(rtsock_iflist_70_hook);
}
