Changeset 174 for freebsd-mos-driver/if_mos.c

Timestamp:

Sep 2, 2010, 3:29:02 PM (14 years ago)

Author:

Rick van der Zwet

Message:

An other condition causing a lock to left over (jumping out the lock state)

File:

• freebsd-mos-driver/if_mos.c (modified) (3 diffs)

freebsd-mos-driver/if_mos.c

@@ -569 +569 @@
         struct mos_softc *sc = uether_getsc(ue);
         struct ifnet *ifp = uether_getifp(ue);
-        //struct ether_multi    *enm;
         struct ifmultiaddr      *ifma;
+
         u_int32_t               h = 0;
         u_int8_t                rxmode;
         u_int8_t                hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+        int                     allmulti = 0;
 
         MOS_LOCK_ASSERT(sc, MA_OWNED);
@@ -579 +580 @@
         rxmode = mos_reg_read_1(sc, MOS_CTL);
 
-        if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {
-allmulti:
-                rxmode |= MOS_CTL_ALLMULTI;
-                mos_reg_write_1(sc, MOS_CTL, rxmode);
-                return;
-        } else
-                rxmode &= ~MOS_CTL_ALLMULTI;
-
-        /* now program new ones */
+        if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC)
+                allmulti = 1;
+
+        /* get all new ones */
         if_maddr_rlock(ifp);
         TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
-                if (ifma->ifma_addr->sa_family != AF_LINK)
-                        goto allmulti;
+                if (ifma->ifma_addr->sa_family != AF_LINK) {
+                        allmulti = 1;
+                        continue;
+                };
                 h = ether_crc32_be(LLADDR((struct sockaddr_dl *)
                     ifma->ifma_addr), ETHER_ADDR_LEN)  >> 26;
@@ -599 +597 @@
         if_maddr_runlock(ifp);
 
-        ifp->if_flags &= ~IFF_ALLMULTI;
-        mos_write_mcast(sc, (void *)&hashtbl);
-        mos_reg_write_1(sc, MOS_CTL, rxmode);
-        return;
+        /* now program new ones */
+        if (allmulti == 1) {
+                rxmode |= MOS_CTL_ALLMULTI;
+                mos_reg_write_1(sc, MOS_CTL, rxmode);
+        } else {
+                rxmode &= ~MOS_CTL_ALLMULTI;
+                ifp->if_flags &= ~IFF_ALLMULTI;
+                mos_write_mcast(sc, (void *)&hashtbl);
+                mos_reg_write_1(sc, MOS_CTL, rxmode);
+        }
 }