From owner-svn-src-all@freebsd.org Fri Jan 11 00:45:23 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3D339149F640;
Fri, 11 Jan 2019 00:45:23 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 94D7177BEC;
Fri, 11 Jan 2019 00:45:22 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8AA36C2A9;
Fri, 11 Jan 2019 00:45:22 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0B0jMHF069107;
Fri, 11 Jan 2019 00:45:22 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0B0jMwi069106;
Fri, 11 Jan 2019 00:45:22 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201901110045.x0B0jMwi069106@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 11 Jan 2019 00:45:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r342923 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 342923
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 94D7177BEC
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.96 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.96)[-0.958,0];
NEURAL_HAM_LONG(-1.00)[-0.998,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Jan 2019 00:45:23 -0000
Author: glebius
Date: Fri Jan 11 00:45:22 2019
New Revision: 342923
URL: https://svnweb.freebsd.org/changeset/base/342923
Log:
Remove recursive NET_EPOCH_ENTER() from sysctl_ifmalist(), missed in r342872.
Modified:
head/sys/net/rtsock.c
Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c Thu Jan 10 23:27:29 2019 (r342922)
+++ head/sys/net/rtsock.c Fri Jan 11 00:45:22 2019 (r342923)
@@ -1830,7 +1830,6 @@ sysctl_ifmalist(int af, struct walkarg *w)
continue;
ifa = ifp->if_addr;
info.rti_info[RTAX_IFP] = ifa ? ifa->ifa_addr : NULL;
- NET_EPOCH_ENTER(et);
CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
if (af && af != ifma->ifma_addr->sa_family)
continue;
@@ -1857,7 +1856,6 @@ sysctl_ifmalist(int af, struct walkarg *w)
break;
}
}
- NET_EPOCH_EXIT(et);
if (error != 0)
break;
}