[src/trunk]: src/sys/netinet6 backout previous (ENETREST special handlng)

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/80ce87718c93
branches:  trunk
changeset: 553405:80ce87718c93
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Oct 15 22:55:34 2003 +0000

description:
backout previous (ENETREST special handlng)

diffstat:

 sys/netinet6/in6.c        |  9 +++------
 sys/netinet6/ip6_mroute.c |  6 ++----
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (59 lines):

diff -r 6a73fcbf9f5b -r 80ce87718c93 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Wed Oct 15 22:55:07 2003 +0000
+++ b/sys/netinet6/in6.c        Wed Oct 15 22:55:34 2003 +0000
@@ -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 @@
                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);
diff -r 6a73fcbf9f5b -r 80ce87718c93 sys/netinet6/ip6_mroute.c
--- a/sys/netinet6/ip6_mroute.c Wed Oct 15 22:55:07 2003 +0000
+++ b/sys/netinet6/ip6_mroute.c Wed Oct 15 22:55:34 2003 +0000
@@ -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 @@
                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;