[src/netbsd-1-4]: src/sys/netiso pullup 1.20->1.21 (chopps). post deadline. Y...

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

details:   https://anonhg.NetBSD.org/src/rev/a56df53be460
branches:  netbsd-1-4
changeset: 469181:a56df53be460
user:      perry <perry%NetBSD.org@localhost>
date:      Fri Jul 02 18:10:49 1999 +0000

description:
pullup 1.20->1.21 (chopps). post deadline. You owe me for this, Christian.

diffstat:

 sys/netiso/iso_snpac.c |  24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diffs (42 lines):

diff -r 8d3974a10089 -r a56df53be460 sys/netiso/iso_snpac.c
--- a/sys/netiso/iso_snpac.c    Fri Jul 02 18:08:33 1999 +0000
+++ b/sys/netiso/iso_snpac.c    Fri Jul 02 18:10:49 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iso_snpac.c,v 1.20 1998/08/25 04:43:46 thorpej Exp $   */
+/*     $NetBSD: iso_snpac.c,v 1.20.6.1 1999/07/02 18:10:49 perry Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -257,25 +257,17 @@
        {all_es_snpa, all_is_snpa, all_l1is_snpa, all_l2is_snpa, 0};
        struct ifreq    ifr;
        register caddr_t *cpp;
-       int             doreset = 0;
 
        bzero((caddr_t) & ifr, sizeof(ifr));
        for (cpp = (caddr_t *) addrlist; *cpp; cpp++) {
                bcopy(*cpp, (caddr_t) ifr.ifr_addr.sa_data, 6);
-               if (req == RTM_ADD) {
-                       if (ether_addmulti(&ifr, (struct ethercom *)ifp) 
-                           == ENETRESET)
-                               doreset++;
-                       else if (ether_delmulti(&ifr, (struct ethercom *)ifp)
-                           == ENETRESET)
-                               doreset++;
-               }
-       }
-       if (doreset) {
-               if (ifp->if_reset)
-                       (*ifp->if_reset) (ifp);
-               else
-                       printf("iso_setmcasts: %s needs reseting to receive iso mcasts\n",
+               if (req == RTM_ADD && (ifp->if_ioctl == 0 ||
+                   (*ifp->if_ioctl)(ifp, SIOCADDMULTI, (caddr_t)&ifr) != 0))
+                       printf("iso_setmcasts: %s unable to add mcast\n",
+                           ifp->if_xname);
+               else if (req == RTM_DELETE && (ifp->if_ioctl == 0 ||
+                   (*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)&ifr) != 0))
+                       printf("iso_setmcasts: %s unable to delete mcast\n",
                            ifp->if_xname);
        }
 }