Use the new if_multiaddrs list for multicast addresses rather than the

previous hackery involving struct in_ifaddr and arpcom.  Get rid of the
abominable multi_kludge.  Update all network interfaces to use the
new machanism.  Distressingly few Ethernet drivers program the multicast
filter properly (assuming the hardware has one, which it usually does).

1 files changed, 9 insertions, 15 deletions

diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index 6125ff8ddce9..a4a29cd3535a 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -311,11 +311,11 @@ vxsetfilter(sc)
     struct vx_softc *sc;
 {
     register struct ifnet *ifp = &sc->arpcom.ac_if;  
-        
+    
     GO_WINDOW(1);           /* Window 1 is operating window */
     outw(BASE + VX_COMMAND, SET_RX_FILTER | FIL_INDIVIDUAL | FIL_BRDCST |
-	((sc->arpcom.ac_multicnt > 0) ? FIL_MULTICAST : 0 ) |
-	((ifp->if_flags & IFF_PROMISC) ? FIL_PROMISC : 0 ));
+	 FIL_MULTICAST |
+	 ((ifp->if_flags & IFF_PROMISC) ? FIL_PROMISC : 0 ));
 }               
 
 static void            
@@ -967,18 +967,12 @@ vxioctl(ifp, cmd, data)
 
     case SIOCADDMULTI:
     case SIOCDELMULTI:
-        error = ((u_int) cmd == SIOCADDMULTI) ?
-            ether_addmulti(ifr, &sc->arpcom) :
-            ether_delmulti(ifr, &sc->arpcom);
-
-        if (error == ENETRESET) {
-            /*
-             * Multicast list has changed; set the hardware filter
-             * accordingly.
-             */
-            vxreset(sc);
-            error = 0;
-        }
+	/*
+	 * Multicast list has changed; set the hardware filter
+	 * accordingly.
+	 */
+	vxreset(sc);
+	error = 0;
         break;