Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 24 May 2019 09:01:54 +0000 (UTC)
From:      "Andrey V. Elsukov" <ae@FreeBSD.org>
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
Message-ID:  <201905240901.x4O91sqx035190@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

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