diff options
| author |   mpi <mpi@openbsd.org> | 2018-07-01 08:53:03 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2018-07-01 08:53:03 +0000 |
| commit | 2e4a4e5c3a8112cdb140a8c6c495cca23ce3faef (patch) | |
| tree | 07d288b2a9ef231ebab565e03695c77d08224458 /sys | |
| parent | Tweak output to behave more like pcidump(8): (diff) | |
| download | wireguard-openbsd-2e4a4e5c3a8112cdb140a8c6c495cca23ce3faef.tar.xz wireguard-openbsd-2e4a4e5c3a8112cdb140a8c6c495cca23ce3faef.zip | |
Retire support for unused RTM_LOCK messages, it's redundant w/ RTM_CHANGE.
ok tb@, sthen@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/route.h | 3 | ||||
| -rw-r--r-- | sys/net/rtsock.c | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/net/route.h b/sys/net/route.h index b9e46030dfa..43386fa41a6 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.170 2018/06/25 09:41:45 mpi Exp $ */ +/* $OpenBSD: route.h,v 1.171 2018/07/01 08:53:03 mpi Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -231,7 +231,6 @@ struct rt_msghdr { #define RTM_LOSING 0x5 /* Kernel Suspects Partitioning */ #define RTM_REDIRECT 0x6 /* Told to use different route */ #define RTM_MISS 0x7 /* Lookup failed on this address */ -#define RTM_LOCK 0x8 /* fix specified metrics */ #define RTM_RESOLVE 0xb /* req to resolve dst to LL addr */ #define RTM_NEWADDR 0xc /* address being added to iface */ #define RTM_DELADDR 0xd /* address being removed from iface */ diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 7bdd3ea556d..afab5d72505 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsock.c,v 1.272 2018/06/25 09:41:45 mpi Exp $ */ +/* $OpenBSD: rtsock.c,v 1.273 2018/07/01 08:53:03 mpi Exp $ */ /* $NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $ */ /* @@ -668,7 +668,6 @@ route_output(struct mbuf *m, struct socket *so, struct sockaddr *dstaddr, case RTM_DELETE: case RTM_GET: case RTM_CHANGE: - case RTM_LOCK: case RTM_PROPOSAL: break; default: @@ -899,7 +898,6 @@ rtm_output(struct rt_msghdr *rtm, struct rtentry **prt, if_put(ifp); break; case RTM_CHANGE: - case RTM_LOCK: rt = rtable_lookup(tableid, info->rti_info[RTAX_DST], info->rti_info[RTAX_NETMASK], info->rti_info[RTAX_GATEWAY], prio); @@ -1062,10 +1060,6 @@ change: } if_group_routechange(info->rti_info[RTAX_DST], info->rti_info[RTAX_NETMASK]); - NET_UNLOCK(); - /* FALLTHROUGH */ - case RTM_LOCK: - NET_LOCK(); rt->rt_locks &= ~(rtm->rtm_inits); rt->rt_locks |= (rtm->rtm_inits & rtm->rtm_rmx.rmx_locks); |