[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by j...

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

details:   https://anonhg.NetBSD.org/src/rev/bbf4f34c6ae8
branches:  netbsd-9
changeset: 963336:bbf4f34c6ae8
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Nov 26 18:30:57 2019 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #486):

        sys/dev/pci/if_mcx.c: revision 1.7

Fix IFF_ALLMULTI handling.

diffstat:

 sys/dev/pci/if_mcx.c |  38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r 118fe14abbfa -r bbf4f34c6ae8 sys/dev/pci/if_mcx.c
--- a/sys/dev/pci/if_mcx.c      Tue Nov 26 08:57:49 2019 +0000
+++ b/sys/dev/pci/if_mcx.c      Tue Nov 26 18:30:57 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_mcx.c,v 1.1.2.5 2019/11/18 19:46:33 martin Exp $ */
+/*     $NetBSD: if_mcx.c,v 1.1.2.6 2019/11/26 18:30:57 martin Exp $ */
 /*     $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
 
 /*
@@ -6205,8 +6205,11 @@
 {
        struct mcx_softc *sc = (struct mcx_softc *)ifp->if_softc;
        struct ifreq *ifr = (struct ifreq *)data;
+       struct ethercom *ec = &sc->sc_ec;
        uint8_t addrhi[ETHER_ADDR_LEN], addrlo[ETHER_ADDR_LEN];
-       int s, i, error = 0;
+       struct ether_multi *enm;
+       struct ether_multistep step;
+       int s, i, flags, error = 0;
 
        s = splnet();
        switch (cmd) {
@@ -6214,8 +6217,10 @@
        case SIOCADDMULTI:
                if (ether_addmulti(ifreq_getaddr(cmd, ifr), &sc->sc_ec) == ENETRESET) {
                        error = ether_multiaddr(&ifr->ifr_addr, addrlo, addrhi);
-                       if (error != 0)
+                       if (error != 0) {
+                               splx(s);
                                return (error);
+                       }
 
                        for (i = 0; i < MCX_NUM_MCAST_FLOWS; i++) {
                                if (sc->sc_mcast_flows[i][0] == 0) {
@@ -6238,7 +6243,7 @@
                                        error = ENETRESET;
                                }
 
-                               if (sc->sc_ec.ec_multicnt > 0) {
+                               if (memcmp(addrlo, addrhi, ETHER_ADDR_LEN)) {
                                        SET(ifp->if_flags, IFF_ALLMULTI);
                                        error = ENETRESET;
                                }
@@ -6249,8 +6254,10 @@
        case SIOCDELMULTI:
                if (ether_delmulti(ifreq_getaddr(cmd, ifr), &sc->sc_ec) == ENETRESET) {
                        error = ether_multiaddr(&ifr->ifr_addr, addrlo, addrhi);
-                       if (error != 0)
+                       if (error != 0) {
+                               splx(s);
                                return (error);
+                       }
 
                        for (i = 0; i < MCX_NUM_MCAST_FLOWS; i++) {
                                if (memcmp(sc->sc_mcast_flows[i], addrlo,
@@ -6269,10 +6276,23 @@
                                sc->sc_extra_mcast--;
 
                        if (ISSET(ifp->if_flags, IFF_ALLMULTI) &&
-                           (sc->sc_extra_mcast == 0) &&
-                           (sc->sc_ec.ec_multicnt == 0)) {
-                               CLR(ifp->if_flags, IFF_ALLMULTI);
-                               error = ENETRESET;
+                           sc->sc_extra_mcast == 0) {
+                               flags = 0;
+                               ETHER_LOCK(ec);
+                               ETHER_FIRST_MULTI(step, ec, enm);
+                               while (enm != NULL) {
+                                       if (memcmp(enm->enm_addrlo,
+                                           enm->enm_addrhi, ETHER_ADDR_LEN)) {
+                                               SET(flags, IFF_ALLMULTI);
+                                               break;
+                                       }
+                                       ETHER_NEXT_MULTI(step, enm);
+                               }
+                               ETHER_UNLOCK(ec);
+                               if (!ISSET(flags, IFF_ALLMULTI)) {
+                                       CLR(ifp->if_flags, IFF_ALLMULTI);
+                                       error = ENETRESET;
+                               }
                        }
                }
                break;