svn commit: r333884 - head/sys/dev/usb/net

[Ed Maste]

Author: emaste
Date: Sat May 19 18:44:29 2018
New Revision: 333884
URL: https://svnweb.freebsd.org/changeset/base/333884

Log:
  muge(4): chase r333813 if_addr_lock rwlock to epoch + mutex
  
  muge was committed to the tree in r333713 but not yet connected to the
  tree, and it crossed paths with the migration to using ck.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/usb/net/if_muge.c

Modified: head/sys/dev/usb/net/if_muge.c
==============================================================================
--- head/sys/dev/usb/net/if_muge.c	Sat May 19 18:27:14 2018	(r333883)
+++ head/sys/dev/usb/net/if_muge.c	Sat May 19 18:44:29 2018	(r333884)
@@ -1816,9 +1816,10 @@ muge_setmulti(struct usb_ether *ue)
 	} else {
 		/* Lock the mac address list before hashing each of them. */
 		if_maddr_rlock(ifp);
-		if (!TAILQ_EMPTY(&ifp->if_multiaddrs)) {
+		if (!CK_STAILQ_EMPTY(&ifp->if_multiaddrs)) {
 			i = 1;
-			TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
+			CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs,
+			    ifma_link) {
 				/* First fill up the perfect address table. */
 				addr = LLADDR((struct sockaddr_dl *)
 				    ifma->ifma_addr);