diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-06-16 19:47:22 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-06-16 19:47:22 +0000 |
| commit | 923bff6e1df80e018f0beeffbcff02d040bdc781 (patch) | |
| tree | df709b2a56f3ff3f7485e5ed0c7365f2807fd5fa /sys/netinet/if_ether.c | |
| parent | 0a99f4e7f625a05ac91541466135e6d4b7e5ae59 (diff) | |
Revert "Always create a local route for every configured IPv4 address",
it introduces a regression with default routes & p2p interfaces.
Problem reported by naddy@
Diffstat (limited to 'sys/netinet/if_ether.c')
| -rw-r--r-- | sys/netinet/if_ether.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index a4a6d67c100..0edf1a9c6de 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.128 2014/06/11 11:30:03 mpi Exp $ */ +/* $OpenBSD: if_ether.c,v 1.129 2014/06/16 19:47:21 mpi Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -174,8 +174,7 @@ arp_rtrequest(int req, struct rtentry *rt) 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) && !la)) { + if (rt->rt_flags & RTF_CLONING) { /* * Case 1: This route should come from a route to iface. */ @@ -190,8 +189,7 @@ arp_rtrequest(int req, struct rtentry *rt) * from it do not need their expiration time set. */ rt->rt_expire = time_second; - if ((rt->rt_flags & RTF_CLONING) != 0) - break; + break; } /* Announce a new entry if requested. */ if (rt->rt_flags & RTF_ANNOUNCE) |