diff options
| author | itojun <itojun@NetBSD.org> | 2003-08-22 21:53:01 +0000 |
|---|---|---|
| committer | itojun <itojun@NetBSD.org> | 2003-08-22 21:53:01 +0000 |
| commit | 82eb4ce914f47a85eaecff7693f7dfded962a4f8 (patch) | |
| tree | b3954caff5b15332e3d6e4c1f05285d41beb63af /sys/net | |
| parent | 9329caaf20c16c7407404cfa9fd16bb7f449dc74 (diff) | |
change the additional arg to be passed to ip{,6}_output to struct socket *.
this fixes KAME policy lookup which was broken by the previous commit.
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_gre.c | 6 | ||||
| -rw-r--r-- | sys/net/if_stf.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index 8b80ef22ac5..25ea515746c 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_gre.c,v 1.46 2003/08/15 03:42:00 jonathan Exp $ */ +/* $NetBSD: if_gre.c,v 1.47 2003/08/22 21:53:01 itojun Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.46 2003/08/15 03:42:00 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gre.c,v 1.47 2003/08/22 21:53:01 itojun Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -337,7 +337,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, ifp->if_obytes += m->m_pkthdr.len; /* send it off */ error = ip_output(m, NULL, &sc->route, 0, - (struct ip_moptions *)0, (struct inpcb *)0); + (struct ip_moptions *)NULL, (struct socket *)NULL); end: if (error) ifp->if_oerrors++; diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index 095a55b34e6..28927294a67 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_stf.c,v 1.34 2003/08/15 03:42:00 jonathan Exp $ */ +/* $NetBSD: if_stf.c,v 1.35 2003/08/22 21:53:02 itojun Exp $ */ /* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */ /* @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.34 2003/08/15 03:42:00 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.35 2003/08/22 21:53:02 itojun Exp $"); #include "opt_inet.h" @@ -466,7 +466,7 @@ stf_output(ifp, m, dst, rt) ifp->if_opackets++; return ip_output(m, NULL, &sc->sc_ro, 0, - (struct ip_moptions *)0, (struct inpcb *)0); + (struct ip_moptions *)NULL, (struct socket *)NULL); } static int |
