diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-04-18 12:10:35 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-04-18 12:10:35 +0000 |
| commit | 0c956a8256e03b02a454122b9d4c9d5f6bd607fb (patch) | |
| tree | 0cc15d10d1203523a15687e38222ad7edd24aa56 /sys | |
| parent | 847d1917cd938018847ac6ade829bc8462baa8e7 (diff) | |
Unbreak RAMDISK, found by deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/ip_input.c | 7 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 071c3acc488..2dd0b36056c 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.271 2016/04/18 06:43:51 mpi Exp $ */ +/* $OpenBSD: ip_input.c,v 1.272 2016/04/18 12:10:34 mpi Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -227,7 +227,10 @@ ipv4_input(struct mbuf *m) { struct ifnet *ifp; struct ip *ip; - int rv, hlen, len; + int hlen, len; +#if defined(MROUTING) || defined(IPSEC) + int rv; +#endif in_addr_t pfrdr = 0; ifp = if_get(m->m_pkthdr.ph_ifidx); diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index d3f85647ac5..6f47f429ca8 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.319 2016/04/18 06:43:51 mpi Exp $ */ +/* $OpenBSD: ip_output.c,v 1.320 2016/04/18 12:10:34 mpi Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -100,11 +100,14 @@ ip_output(struct mbuf *m0, struct mbuf *opt, struct route *ro, int flags, struct ifnet *ifp = NULL; struct mbuf *m = m0; int hlen = sizeof (struct ip); - int rv, len, error = 0; + int len, error = 0; struct route iproute; struct sockaddr_in *dst; struct tdb *tdb = NULL; u_long mtu; +#if defined(MROUTING) + int rv; +#endif #ifdef IPSEC if (inp && (inp->inp_flags & INP_IPV6) != 0) |