diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2015-12-02 18:38:20 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2015-12-02 18:38:20 +0000 |
| commit | 5b28c4c1f86317dbd78b91b7900aa6dde5aefb05 (patch) | |
| tree | 5b990e3b173cff012fc9578137027a8ca093047a /sys | |
| parent | 91e723a78c1484badd441863b11944e107b207ee (diff) | |
There is no reason for this carp magic in arpresolve. rt->rt_ifp has to
be the same as ifp or something is very broken. So remove this including
one more rt_ifp. OK mpi@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/if_ether.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index a1fe24984ac..031ec9dc3a2 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.194 2015/12/02 16:35:53 bluhm Exp $ */ +/* $OpenBSD: if_ether.c,v 1.195 2015/12/02 18:38:19 claudio Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -401,11 +401,6 @@ arpresolve(struct ifnet *ifp, struct rtentry *rt0, struct mbuf *m, arprequest(ifp, &satosin(rt->rt_ifa->ifa_addr)->sin_addr.s_addr, &satosin(dst)->sin_addr.s_addr, -#if NCARP > 0 - (rt->rt_ifp->if_type == IFT_CARP) ? - ((struct arpcom *) rt->rt_ifp->if_softc - )->ac_enaddr : -#endif ac->ac_enaddr); else { rt->rt_flags |= RTF_REJECT; |