summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-05-30 12:31:10 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-05-30 12:31:10 +0000
commit21a9610db67c01af4b090fc13b13414370e55310 (patch)
tree84b87938da2152c652b4c5f58f0c724dd76d652f
parentbba73997cfc752690c65b0edbf16ae118865ed35 (diff)
Update for new prototypes.
-rw-r--r--sys/netinet6/in6_gif.c4
-rw-r--r--sys/netinet6/ip6_output.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 771c2db26bf..c50cb57d754 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_gif.c,v 1.13 2001/05/11 17:20:12 aaron Exp $ */
+/* $OpenBSD: in6_gif.c,v 1.14 2001/05/30 12:31:09 angelos Exp $ */
/* $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $ */
/*
@@ -167,7 +167,7 @@ in6_gif_output(ifp, family, m, rt)
/* encapsulate into IPv6 packet */
mp = NULL;
- error = ipip_output(m, &tdb, &mp, hlen, poff, NULL);
+ error = ipip_output(m, &tdb, &mp, hlen, poff);
if (error)
return error;
else if (mp == NULL)
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 7820ec6598a..6448b194226 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.39 2001/05/28 06:45:32 angelos Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.40 2001/05/30 12:31:09 angelos Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -567,8 +567,7 @@ skip_ipsec2:;
m->m_flags &= ~(M_BCAST | M_MCAST); /* just in case */
/* Callee frees mbuf */
- /* XXX Should use last argument */
- error = ipsp_process_packet(m, tdb, AF_INET6, 0, NULL);
+ error = ipsp_process_packet(m, tdb, AF_INET6, 0);
splx(s);
return error; /* Nothing more to be done */
}