svn commit: r353484 - head/sys/netinet

Gleb Smirnoff glebius at FreeBSD.org
Mon Oct 14 04:10:01 UTC 2019


Author: glebius
Date: Mon Oct 14 04:10:00 2019
New Revision: 353484
URL: https://svnweb.freebsd.org/changeset/base/353484

Log:
  Revert r353313. It is not needed with r353357 and is actually incorrect.

Modified:
  head/sys/netinet/in_mcast.c

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c	Sun Oct 13 22:26:55 2019	(r353483)
+++ head/sys/netinet/in_mcast.c	Mon Oct 14 04:10:00 2019	(r353484)
@@ -2193,14 +2193,12 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt
 	 * Begin state merge transaction at IGMP layer.
 	 */
 	if (is_new) {
-		struct epoch_tracker et;
-
 		in_pcbref(inp);
 		INP_WUNLOCK(inp);
-		NET_EPOCH_ENTER(et);
+
 		error = in_joingroup_locked(ifp, &gsa->sin.sin_addr, imf,
 		    &imf->imf_inm);
-		NET_EPOCH_EXIT(et);
+
 		INP_WLOCK(inp);
 		if (in_pcbrele_wlocked(inp)) {
 			error = ENXIO;


More information about the svn-src-all mailing list