Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet6/nd6_nbr.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet6/nd6_nbr.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- src/sys/netinet6/nd6_nbr.c 2000/03/24 04:09:05 1.21 +++ src/sys/netinet6/nd6_nbr.c 2000/05/19 01:40:19 1.22 @@ -1,10 +1,10 @@ -/* $NetBSD: nd6_nbr.c,v 1.21 2000/03/24 04:09:05 itojun Exp $ */ -/* $KAME: nd6_nbr.c,v 1.28 2000/02/26 06:53:11 itojun Exp $ */ +/* $NetBSD: nd6_nbr.c,v 1.22 2000/05/19 01:40:19 itojun Exp $ */ +/* $KAME: nd6_nbr.c,v 1.36 2000/05/17 12:35:59 jinmei Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -16,7 +16,7 @@ * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -758,9 +758,13 @@ nd6_na_input(m, off, icmp6len) #ifdef OLDIP6OUTPUT (*ifp->if_output)(ifp, ln->ln_hold, rt_key(rt), rt); #else - nd6_output(ifp, ln->ln_hold, + /* + * we assume ifp is not a p2p here, so just set the 2nd + * argument as the 1st one. + */ + nd6_output(ifp, ifp, ln->ln_hold, (struct sockaddr_in6 *)rt_key(rt), rt); -#endif +#endif ln->ln_hold = 0; }