diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-01 12:22:19 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-12-01 12:22:19 +0000 |
| commit | a804da2c0cff632eac2eaa839cfbf48f400fbe25 (patch) | |
| tree | 683ab3edc6308fa4e4d2bd4e594527958cdc263b | |
| parent | 7a6fbb6f076b4bcdd3d1edcf976bedeecb2acb7d (diff) | |
Remove backward compatibility for "older version of routed and gated".
ok millert@, bluhm@
| -rw-r--r-- | sys/netinet/if_ether.c | 10 | ||||
| -rw-r--r-- | sys/netinet6/nd6.c | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 7e990ddd57a..bc8d40227d9 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.190 2015/11/20 10:51:30 mpi Exp $ */ +/* $OpenBSD: if_ether.c,v 1.191 2015/12/01 12:22:18 mpi Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -161,14 +161,6 @@ arp_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) switch (req) { case RTM_ADD: - /* - * XXX: If this is a manually added route to interface - * such as older version of routed or gated might provide, - * restore cloning bit. - */ - if ((rt->rt_flags & RTF_HOST) == 0 && rt_mask(rt) && - satosin(rt_mask(rt))->sin_addr.s_addr != 0xffffffff) - rt->rt_flags |= RTF_CLONING; if (rt->rt_flags & RTF_CLONING || ((rt->rt_flags & (RTF_LLINFO | RTF_LOCAL)) && !la)) { /* diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 88d7372160c..2f92472c473 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6.c,v 1.172 2015/11/06 11:20:56 mpi Exp $ */ +/* $OpenBSD: nd6.c,v 1.173 2015/12/01 12:22:18 mpi Exp $ */ /* $KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $ */ /* @@ -937,13 +937,6 @@ nd6_rtrequest(struct ifnet *ifp, int req, struct rtentry *rt) switch (req) { case RTM_ADD: - /* - * There is no backward compatibility :) - * - * if ((rt->rt_flags & RTF_HOST) == 0 && - * SIN(rt_mask(rt))->sin_addr.s_addr != 0xffffffff) - * rt->rt_flags |= RTF_CLONING; - */ if ((rt->rt_flags & RTF_CLONING) || ((rt->rt_flags & (RTF_LLINFO | RTF_LOCAL)) && ln == NULL)) { if (ln != NULL) |