From owner-svn-src-stable-12@freebsd.org Fri May 24 09:01:56 2019 Return-Path: Delivered-To: svn-src-stable-12@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 80AEC15A4764; Fri, 24 May 2019 09:01:56 +0000 (UTC) (envelope-from ae@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 224F283F13; Fri, 24 May 2019 09:01:56 +0000 (UTC) (envelope-from ae@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 489DC1A918; Fri, 24 May 2019 09:01:55 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4O91thX035191; Fri, 24 May 2019 09:01:55 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4O91sqx035190; Fri, 24 May 2019 09:01:54 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201905240901.x4O91sqx035190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Fri, 24 May 2019 09:01:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r348234 - in stable/12/sys: netinet netinet6 X-SVN-Group: stable-12 X-SVN-Commit-Author: ae X-SVN-Commit-Paths: in stable/12/sys: netinet netinet6 X-SVN-Commit-Revision: 348234 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 224F283F13 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 May 2019 09:01:56 -0000 Author: ae Date: Fri May 24 09:01:54 2019 New Revision: 348234 URL: https://svnweb.freebsd.org/changeset/base/348234 Log: Fix the build. Use NET_EPOCH_ENTER_ET() and NET_EPOCH_EXIT_ET(). This is direct commit to stable/12, since macros are different in stable/12 and head/ branches. Modified: stable/12/sys/netinet/ip_gre.c stable/12/sys/netinet6/ip6_gre.c Modified: stable/12/sys/netinet/ip_gre.c ============================================================================== --- stable/12/sys/netinet/ip_gre.c Fri May 24 08:42:34 2019 (r348233) +++ stable/12/sys/netinet/ip_gre.c Fri May 24 09:01:54 2019 (r348234) @@ -228,7 +228,7 @@ in_gre_udp_input(struct mbuf *m, int off, struct inpcb struct gre_softc *sc; in_addr_t dst; - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER_ET(et); /* * udp_append() holds reference to inp, it is safe to check * inp_flags2 without INP_RLOCK(). @@ -238,7 +238,7 @@ in_gre_udp_input(struct mbuf *m, int off, struct inpcb * gre_sofree() via epoch_call(). */ if (__predict_false(inp->inp_flags2 & INP_FREED)) { - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); m_freem(m); return; } @@ -251,11 +251,11 @@ in_gre_udp_input(struct mbuf *m, int off, struct inpcb } if (sc != NULL && (GRE2IFP(sc)->if_flags & IFF_UP) != 0){ gre_input(m, off + sizeof(struct udphdr), IPPROTO_UDP, sc); - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); return; } m_freem(m); - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); } static int Modified: stable/12/sys/netinet6/ip6_gre.c ============================================================================== --- stable/12/sys/netinet6/ip6_gre.c Fri May 24 08:42:34 2019 (r348233) +++ stable/12/sys/netinet6/ip6_gre.c Fri May 24 09:01:54 2019 (r348234) @@ -221,7 +221,7 @@ in6_gre_udp_input(struct mbuf *m, int off, struct inpc struct gre_softc *sc; struct sockaddr_in6 dst; - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER_ET(et); /* * udp_append() holds reference to inp, it is safe to check * inp_flags2 without INP_RLOCK(). @@ -231,7 +231,7 @@ in6_gre_udp_input(struct mbuf *m, int off, struct inpc * gre_sofree() via epoch_call(). */ if (__predict_false(inp->inp_flags2 & INP_FREED)) { - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); m_freem(m); return; } @@ -239,7 +239,7 @@ in6_gre_udp_input(struct mbuf *m, int off, struct inpc gs = (struct gre_socket *)ctx; dst = *(const struct sockaddr_in6 *)sa; if (sa6_embedscope(&dst, 0)) { - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); m_freem(m); return; } @@ -249,11 +249,11 @@ in6_gre_udp_input(struct mbuf *m, int off, struct inpc } if (sc != NULL && (GRE2IFP(sc)->if_flags & IFF_UP) != 0){ gre_input(m, off + sizeof(struct udphdr), IPPROTO_UDP, sc); - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); return; } m_freem(m); - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); } static int