Date: Fri, 6 Dec 2019 22:20:26 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355466 - head/sys/netinet Message-ID: <201912062220.xB6MKQsF042154@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Fri Dec 6 22:20:26 2019 New Revision: 355466 URL: https://svnweb.freebsd.org/changeset/base/355466 Log: Remove the extra epoch tracker change sneaked into r355449 and was not part of the originally reviewed or described change. Pointyhat to: bz Reported by: glebius Modified: head/sys/netinet/ip_carp.c Modified: head/sys/netinet/ip_carp.c ============================================================================== --- head/sys/netinet/ip_carp.c Fri Dec 6 22:12:39 2019 (r355465) +++ head/sys/netinet/ip_carp.c Fri Dec 6 22:20:26 2019 (r355466) @@ -978,7 +978,6 @@ carp_send_ad_locked(struct carp_softc *sc) #endif /* INET */ #ifdef INET6 if (sc->sc_naddrs6) { - struct epoch_tracker et; struct ip6_hdr *ip6; m = m_gethdr(M_NOWAIT, MT_DATA); @@ -1032,10 +1031,8 @@ carp_send_ad_locked(struct carp_softc *sc) CARPSTATS_INC(carps_opackets6); - NET_EPOCH_ENTER(et); carp_send_ad_error(sc, ip6_output(m, NULL, NULL, 0, &sc->sc_carpdev->if_carp->cif_im6o, NULL, NULL)); - NET_EPOCH_EXIT(et); } #endif /* INET6 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912062220.xB6MKQsF042154>