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

Obtained from:	KAME
MFC after:	3 weeks
This commit is contained in:
ume 2002-10-17 17:47:55 +00:00
parent 685116d018
commit ad75b06815
5 changed files with 6 additions and 8 deletions

View File

@ -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:

View File

@ -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;

View File

@ -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 *);

View File

@ -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;

View File

@ -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 *));