diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-01-22 09:06:23 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2018-01-22 09:06:23 +0000 |
| commit | 9249b2fd93a657e720a6f7d86b480ac49b53a424 (patch) | |
| tree | 5e44a03f7e961aa08338eae2fe557905c3be2f66 | |
| parent | 6fca79ea4943c0f2127c97f7b6a7d16cfbaf06ac (diff) | |
Use ip_send() to not call ip_output() recursively in *start() routine.
ok visa@
| -rw-r--r-- | sys/net/if_etherip.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/net/if_etherip.c b/sys/net/if_etherip.c index e4e3c439b7d..c304fcdfd6f 100644 --- a/sys/net/if_etherip.c +++ b/sys/net/if_etherip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_etherip.c,v 1.29 2018/01/09 15:24:24 bluhm Exp $ */ +/* $OpenBSD: if_etherip.c,v 1.30 2018/01/22 09:06:22 mpi Exp $ */ /* * Copyright (c) 2015 Kazuya GODA <goda@openbsd.org> * @@ -394,7 +394,8 @@ ip_etherip_output(struct ifnet *ifp, struct mbuf *m) etheripstat_pkt(etherips_opackets, etherips_obytes, m->m_pkthdr.len - (sizeof(struct ip) + sizeof(struct etherip_header))); - return ip_output(m, NULL, NULL, IP_RAWOUTPUT, NULL, NULL, 0); + ip_send(m); + return (0); } int @@ -546,7 +547,8 @@ ip6_etherip_output(struct ifnet *ifp, struct mbuf *m) etheripstat_pkt(etherips_opackets, etherips_obytes, m->m_pkthdr.len - (sizeof(struct ip6_hdr) + sizeof(struct etherip_header))); - return ip6_output(m, 0, NULL, IPV6_MINMTU, 0, NULL); + ip6_send(m); + return (0); drop: m_freem(m); |