diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-03-26 10:46:54 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-03-26 10:46:54 +0000 |
| commit | b3306ec087b5fa4b2879b207479bd75814aa36f0 (patch) | |
| tree | f601ebc0fbc5ce54f408eb16a3a2350bd0bca129 | |
| parent | a1c9af3c2c13417684044de10947f4a73363e1e1 (diff) | |
No need to check here if the destination address is ours, because in
such case loouput() is called not ether_output().
ok claudio@, mikeb@
| -rw-r--r-- | sys/net/if_ethersubr.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 0bab06e13e0..98ef35eb456 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.162 2014/02/17 14:48:48 mpi Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.163 2014/03/26 10:46:53 mpi Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -228,14 +228,6 @@ ether_output(struct ifnet *ifp0, struct mbuf *m0, struct sockaddr *dst, #if NCARP > 0 if (ifp->if_type == IFT_CARP) { - struct ifaddr *ifa; - - /* loop back if this is going to the carp interface */ - if (dst != NULL && LINK_STATE_IS_UP(ifp0->if_link_state) && - (ifa = ifa_ifwithaddr(dst, ifp->if_rdomain)) != NULL && - ifa->ifa_ifp == ifp0) - return (looutput(ifp0, m, dst, rt0)); - ifp = ifp->if_carpdev; ac = (struct arpcom *)ifp; |