Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 10 Oct 2019 23:51:14 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353425 - head/sys/net
Message-ID:  <201910102351.x9ANpEkv086953@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Thu Oct 10 23:51:14 2019
New Revision: 353425
URL: https://svnweb.freebsd.org/changeset/base/353425

Log:
  Don't use if_maddr_rlock() in tuntap(4), use epoch(9) directly instead.

Modified:
  head/sys/net/if_tuntap.c

Modified: head/sys/net/if_tuntap.c
==============================================================================
--- head/sys/net/if_tuntap.c	Thu Oct 10 23:50:32 2019	(r353424)
+++ head/sys/net/if_tuntap.c	Thu Oct 10 23:51:14 2019	(r353425)
@@ -1151,6 +1151,7 @@ tuninit(struct ifnet *ifp)
 {
 	struct tuntap_softc *tp = ifp->if_softc;
 #ifdef INET
+	struct epoch_tracker et;
 	struct ifaddr *ifa;
 #endif
 
@@ -1162,7 +1163,7 @@ tuninit(struct ifnet *ifp)
 		ifp->if_flags |= IFF_UP;
 		getmicrotime(&ifp->if_lastchange);
 #ifdef INET
-		if_addr_rlock(ifp);
+		NET_EPOCH_ENTER(et);
 		CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			if (ifa->ifa_addr->sa_family == AF_INET) {
 				struct sockaddr_in *si;
@@ -1176,7 +1177,7 @@ tuninit(struct ifnet *ifp)
 					tp->tun_flags |= TUN_DSTADDR;
 			}
 		}
-		if_addr_runlock(ifp);
+		NET_EPOCH_EXIT(et);
 #endif
 		TUN_UNLOCK(tp);
 	} else {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910102351.x9ANpEkv086953>