diff options
| author |   claudio <claudio@openbsd.org> | 2009-05-31 04:07:03 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2009-05-31 04:07:03 +0000 |
| commit | e1a80e01ea2644c812d27b2630882795b6557a3b (patch) | |
| tree | 6fab4187889c4851d66607737a1fd449e345fda6 | |
| parent | Fix RAMDISK kernels after previous. amd64_has_xcrypt needs to be (diff) | |
| download | wireguard-openbsd-e1a80e01ea2644c812d27b2630882795b6557a3b.tar.xz wireguard-openbsd-e1a80e01ea2644c812d27b2630882795b6557a3b.zip | |
Reenable interface state tracking now that I found and fixed the cause of
the rtfree panic seen by some people.
| -rw-r--r-- | sys/net/if.c | 8 | ||||
| -rw-r--r-- | sys/net/route.c | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index a7425d395c2..484fbb715a2 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.189 2009/03/15 19:40:41 miod Exp $ */ +/* $OpenBSD: if.c,v 1.190 2009/05/31 04:07:03 claudio Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -1088,11 +1088,9 @@ if_down(struct ifnet *ifp) bstp_ifstate(ifp); #endif rt_ifmsg(ifp); -#if 0 #ifndef SMALL_KERNEL rt_if_track(ifp); #endif -#endif } /* @@ -1130,11 +1128,9 @@ if_up(struct ifnet *ifp) in6_if_up(ifp); #endif -#if 0 #ifndef SMALL_KERNEL rt_if_track(ifp); #endif -#endif m_clinitifp(ifp); } @@ -1147,11 +1143,9 @@ void if_link_state_change(struct ifnet *ifp) { rt_ifmsg(ifp); -#if 0 #ifndef SMALL_KERNEL rt_if_track(ifp); #endif -#endif dohooks(ifp->if_linkstatehooks, 0); } diff --git a/sys/net/route.c b/sys/net/route.c index bd7861b761b..c09effaf253 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.107 2009/05/26 08:29:44 reyk Exp $ */ +/* $OpenBSD: route.c,v 1.108 2009/05/31 04:07:03 claudio Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -834,7 +834,6 @@ makeroute: if (prio == 0) prio = ifa->ifa_ifp->if_priority + RTP_STATIC; rt->rt_priority = prio; /* init routing priority */ -#if 0 if ((LINK_STATE_IS_UP(ifa->ifa_ifp->if_link_state) || ifa->ifa_ifp->if_link_state == LINK_STATE_UNKNOWN) && ifa->ifa_ifp->if_flags & IFF_UP) @@ -843,7 +842,6 @@ makeroute: rt->rt_flags &= ~RTF_UP; rt->rt_priority |= RTP_DOWN; } -#endif LIST_INIT(&rt->rt_timer); if (rt_setgate(rt, info->rti_info[RTAX_DST], info->rti_info[RTAX_GATEWAY], tableid)) { |