Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backout previous (ENETREST special handlng)

Browse Source
This commit is contained in:
itojun 2003-10-15 22:55:34 +00:00
parent 390e87a8b6
commit ba71e93c60
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netinet6/in6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6.c,v 1.80 2003/10/15 22:15:25 itojun Exp $ */
/* $NetBSD: in6.c,v 1.81 2003/10/15 22:55:34 itojun Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.80 2003/10/15 22:15:25 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.81 2003/10/15 22:55:34 itojun Exp $");
#include "opt_inet.h"
@ -1882,12 +1882,9 @@ in6_addmulti(maddr6, ifp, errorp)
ifr.ifr_addr.sin6_addr = *maddr6;
if (ifp->if_ioctl == NULL)
*errorp = ENXIO; /* XXX: appropriate? */
else {
else
*errorp = (*ifp->if_ioctl)(ifp, SIOCADDMULTI,
(caddr_t)&ifr);
if (*errorp == ENETRESET)
*errorp = 0;
}
if (*errorp) {
LIST_REMOVE(in6m, in6m_entry);
free(in6m, M_IPMADDR);

6
sys/netinet6/ip6_mroute.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ip6_mroute.c,v 1.56 2003/10/15 22:16:35 itojun Exp $ */
/* $NetBSD: ip6_mroute.c,v 1.57 2003/10/15 22:55:34 itojun Exp $ */
/* $KAME: ip6_mroute.c,v 1.49 2001/07/25 09:21:18 jinmei Exp $ */
/*
@ -117,7 +117,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.56 2003/10/15 22:16:35 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: ip6_mroute.c,v 1.57 2003/10/15 22:55:34 itojun Exp $");
#include "opt_inet.h"
#include "opt_mrouting.h"
@ -668,8 +668,6 @@ add_m6if(mifcp)
ifr.ifr_addr.sin6_family = AF_INET6;
ifr.ifr_addr.sin6_addr = in6addr_any;
error = (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr);
if (error == ENETRESET)
error = 0;
splx(s);
if (error)
return error;