diff options
| author |   dlg <dlg@openbsd.org> | 2019-10-04 05:00:49 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-10-04 05:00:49 +0000 |
| commit | a3a66860074c9c1c62332207ffd2ad04af7abb15 (patch) | |
| tree | 43f1cef88d70b7f0e16fde800399bff59e4eff35 | |
| parent | get rid of prototypes for mplsip_input and mplsip_output. they don't exist. (diff) | |
| download | wireguard-openbsd-a3a66860074c9c1c62332207ffd2ad04af7abb15.tar.xz wireguard-openbsd-a3a66860074c9c1c62332207ffd2ad04af7abb15.zip | |
gif shouldn't include netinet/ip_ether.h, cos gif doesnt do etherip.
ip_ether.h is where netinet/ip_ipip.h got the forward declaration
for struct tdb from though, so fix that before cutting ip_ether.h
out of gif.
| -rw-r--r-- | sys/net/if_gif.c | 3 | ||||
| -rw-r--r-- | sys/netinet/ip_ether.h | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_ipip.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 49b163d1ef8..07c11fbb40f 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.c,v 1.127 2019/04/19 07:39:37 dlg Exp $ */ +/* $OpenBSD: if_gif.c,v 1.128 2019/10/04 05:00:49 dlg Exp $ */ /* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */ /* @@ -46,7 +46,6 @@ #include <netinet/in.h> #include <netinet/in_var.h> #include <netinet/ip.h> -#include <netinet/ip_ether.h> #include <netinet/ip_var.h> #include <netinet/ip_ipip.h> #include <netinet/ip_ecn.h> diff --git a/sys/netinet/ip_ether.h b/sys/netinet/ip_ether.h index c70779ed382..5e5e3ae2c3a 100644 --- a/sys/netinet/ip_ether.h +++ b/sys/netinet/ip_ether.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ether.h,v 1.29 2019/10/04 04:52:40 dlg Exp $ */ +/* $OpenBSD: ip_ether.h,v 1.30 2019/10/04 05:00:49 dlg Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@adk.gr) * @@ -107,7 +107,5 @@ etheripstat_pkt(enum etheripstat_counters pcounter, counters_pkt(etheripcounters, pcounter, bcounter, v); } -struct tdb; /* XXX within #ifdef MPLS? */ - #endif /* _KERNEL */ #endif /* _NETINET_IP_ETHER_H_ */ diff --git a/sys/netinet/ip_ipip.h b/sys/netinet/ip_ipip.h index 3ff6d1e1aaa..87807dab457 100644 --- a/sys/netinet/ip_ipip.h +++ b/sys/netinet/ip_ipip.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipip.h,v 1.10 2017/06/20 11:12:13 bluhm Exp $ */ +/* $OpenBSD: ip_ipip.h,v 1.11 2019/10/04 05:00:49 dlg Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -104,6 +104,8 @@ ipipstat_add(enum ipipstat_counters c, uint64_t v) counters_add(ipipcounters, c, v); } +struct tdb; + void ipip_init(void); int ipip_input(struct mbuf **, int *, int, int); int ipip_input_if(struct mbuf **, int *, int, int, struct ifnet *); |