From 0842ea9bb98fa8327fa040f9a487e7bb66aba60b Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Sat, 19 May 2018 18:44:29 +0000 Subject: [PATCH] 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 --- sys/dev/usb/net/if_muge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/net/if_muge.c b/sys/dev/usb/net/if_muge.c index 035e3e1ab42..157e8affbb0 100644 --- a/sys/dev/usb/net/if_muge.c +++ b/sys/dev/usb/net/if_muge.c @@ -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);