[src/trunk]: src/sys/compat/common Move the set-up of the net.oroute... sysct...

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

details:   https://anonhg.NetBSD.org/src/rev/3be2094c2ae3
branches:  trunk
changeset: 450907:3be2094c2ae3
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Mon Apr 29 08:31:29 2019 +0000

description:
Move the set-up of the net.oroute... sysctl tree to compat_50 since
the new AF_ROUTE was introduced in NetBSD-6.0

diffstat:

 sys/compat/common/rtsock_50.c |  8 ++++++--
 sys/compat/common/rtsock_70.c |  8 ++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (84 lines):

diff -r 840be7e58579 -r 3be2094c2ae3 sys/compat/common/rtsock_50.c
--- a/sys/compat/common/rtsock_50.c     Mon Apr 29 07:55:38 2019 +0000
+++ b/sys/compat/common/rtsock_50.c     Mon Apr 29 08:31:29 2019 +0000
@@ -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 @@
 #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 @@
            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); 
diff -r 840be7e58579 -r 3be2094c2ae3 sys/compat/common/rtsock_70.c
--- a/sys/compat/common/rtsock_70.c     Mon Apr 29 07:55:38 2019 +0000
+++ b/sys/compat/common/rtsock_70.c     Mon Apr 29 08:31:29 2019 +0000
@@ -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 @@
 #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 @@
        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);
 }