diff options
| author |   niklas <niklas@openbsd.org> | 1996-03-04 08:21:52 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1996-03-04 08:21:52 +0000 |
| commit | fead9145f79a4a94e8a2d3c221ce00364d408b78 (patch) | |
| tree | f40c8d82bd785ac30bc4aeb606e7fc369d680b0b | |
| parent | From NetBSD: 960217 merge (diff) | |
| download | wireguard-openbsd-fead9145f79a4a94e8a2d3c221ce00364d408b78.tar.xz wireguard-openbsd-fead9145f79a4a94e8a2d3c221ce00364d408b78.zip | |
From NetBSD: Fix PR/2095 options MROUTING did not compile.
| -rw-r--r-- | sys/netinet/in_proto.c | 6 | ||||
| -rw-r--r-- | sys/netinet/raw_ip.c | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 51dc49af433..74a66e49e04 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,5 +1,5 @@ -/* $OpenBSD: in_proto.c,v 1.2 1996/03/03 22:30:33 niklas Exp $ */ -/* $NetBSD: in_proto.c,v 1.13 1996/02/13 23:42:09 christos Exp $ */ +/* $OpenBSD: in_proto.c,v 1.3 1996/03/04 08:21:53 niklas Exp $ */ +/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -81,7 +81,7 @@ #endif /* EON */ #ifdef MROUTING -#include <netinet/mroute.h> +#include <netinet/ip_mroute.h> #endif /* MROUTING */ extern struct domain inetdomain; diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 498d38a6e04..38562c2a2ae 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -1,5 +1,5 @@ -/* $OpenBSD: raw_ip.c,v 1.3 1996/03/03 22:30:43 niklas Exp $ */ -/* $NetBSD: raw_ip.c,v 1.24 1996/02/13 23:43:29 christos Exp $ */ +/* $OpenBSD: raw_ip.c,v 1.4 1996/03/04 08:21:52 niklas Exp $ */ +/* $NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -205,6 +205,9 @@ rip_ctloutput(op, so, level, optname, m) struct mbuf **m; { register struct inpcb *inp = sotoinpcb(so); +#ifdef MROUTING + int error; +#endif if (level != IPPROTO_IP) { if (m != 0 && *m != 0) |