svn commit: r353423 - head/sys/netgraph

[Gleb Smirnoff]

Author: glebius
Date: Thu Oct 10 23:49:19 2019
New Revision: 353423
URL: https://svnweb.freebsd.org/changeset/base/353423

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

Modified:
  head/sys/netgraph/ng_eiface.c

Modified: head/sys/netgraph/ng_eiface.c
==============================================================================
--- head/sys/netgraph/ng_eiface.c	Thu Oct 10 23:48:42 2019	(r353422)
+++ head/sys/netgraph/ng_eiface.c	Thu Oct 10 23:49:19 2019	(r353423)
@@ -506,18 +506,19 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p last
 
 		case NGM_EIFACE_GET_IFADDRS:
 		    {
+			struct epoch_tracker et;
 			struct ifaddr *ifa;
 			caddr_t ptr;
 			int buflen;
 
 			/* Determine size of response and allocate it */
 			buflen = 0;
-			if_addr_rlock(ifp);
+			NET_EPOCH_ENTER(et);
 			CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)
 				buflen += SA_SIZE(ifa->ifa_addr);
 			NG_MKRESPONSE(resp, msg, buflen, M_NOWAIT);
 			if (resp == NULL) {
-				if_addr_runlock(ifp);
+				NET_EPOCH_EXIT(et);
 				error = ENOMEM;
 				break;
 			}
@@ -536,7 +537,7 @@ ng_eiface_rcvmsg(node_p node, item_p item, hook_p last
 				ptr += len;
 				buflen -= len;
 			}
-			if_addr_runlock(ifp);
+			NET_EPOCH_EXIT(et);
 			break;
 		    }