last arg of in6?_gif_output() is not used any more.

Obtained from:	KAME
MFC after:	3 weeks

5 files changed, 6 insertions, 8 deletions

diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 6186b07..b3abb63 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -377,12 +377,12 @@ gif_output(ifp, m, dst, rt)
 	switch (sc->gif_psrc->sa_family) {
 #ifdef INET
 	case AF_INET:
-		error = in_gif_output(ifp, dst->sa_family, m, rt);
+		error = in_gif_output(ifp, dst->sa_family, m);
 		break;
 #endif
 #ifdef INET6
 	case AF_INET6:
-		error = in6_gif_output(ifp, dst->sa_family, m, rt);
+		error = in6_gif_output(ifp, dst->sa_family, m);
 		break;
 #endif
 	default:
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index e056130..cdf094a 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -87,11 +87,10 @@ SYSCTL_INT(_net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW,
 	&ip_gif_ttl,	0, "");
 
 int
-in_gif_output(ifp, family, m, rt)
+in_gif_output(ifp, family, m)
 	struct ifnet	*ifp;
 	int		family;
 	struct mbuf	*m;
-	struct rtentry *rt;
 {
 	struct gif_softc *sc = (struct gif_softc*)ifp;
 	struct sockaddr_in *dst = (struct sockaddr_in *)&sc->gif_ro.ro_dst;
diff --git a/sys/netinet/in_gif.h b/sys/netinet/in_gif.h
index 8197d29..f2a1aec 100644
--- a/sys/netinet/in_gif.h
+++ b/sys/netinet/in_gif.h
@@ -37,7 +37,7 @@
 
 struct gif_softc;
 void in_gif_input(struct mbuf *, int off);
-int in_gif_output(struct ifnet *, int, struct mbuf *, struct rtentry *);
+int in_gif_output(struct ifnet *, int, struct mbuf *);
 int gif_encapcheck4(const struct mbuf *, int, int, void *);
 int in_gif_attach(struct gif_softc *);
 int in_gif_detach(struct gif_softc *);
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 50e37c3..b560075 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -83,11 +83,10 @@ struct ip6protosw in6_gif_protosw =
 };
 
 int
-in6_gif_output(ifp, family, m, rt)
+in6_gif_output(ifp, family, m)
 	struct ifnet *ifp;
 	int family; /* family of the packet to be encapsulate. */
 	struct mbuf *m;
-	struct rtentry *rt;
 {
 	struct gif_softc *sc = (struct gif_softc*)ifp;
 	struct sockaddr_in6 *dst = (struct sockaddr_in6 *)&sc->gif_ro6.ro_dst;
diff --git a/sys/netinet6/in6_gif.h b/sys/netinet6/in6_gif.h
index 12884a2..83625e4 100644
--- a/sys/netinet6/in6_gif.h
+++ b/sys/netinet6/in6_gif.h
@@ -37,7 +37,7 @@
 
 struct gif_softc;
 int in6_gif_input __P((struct mbuf **, int *, int));
-int in6_gif_output __P((struct ifnet *, int, struct mbuf *, struct rtentry *));
+int in6_gif_output __P((struct ifnet *, int, struct mbuf *));
 int gif_encapcheck6 __P((const struct mbuf *, int, int, void *));
 int in6_gif_attach __P((struct gif_softc *));
 int in6_gif_detach __P((struct gif_softc *));