From owner-svn-src-head@freebsd.org Fri Dec 6 22:09:34 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B4E751B8455; Fri, 6 Dec 2019 22:09:34 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 47V6FV34zSz3y2Z; Fri, 6 Dec 2019 22:09:34 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id xB6M9PZa046459 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 6 Dec 2019 14:09:25 -0800 (PST) (envelope-from glebius@freebsd.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id xB6M9P6K046458; Fri, 6 Dec 2019 14:09:25 -0800 (PST) (envelope-from glebius@freebsd.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@freebsd.org using -f Date: Fri, 6 Dec 2019 14:09:25 -0800 From: Gleb Smirnoff To: "Bjoern A. Zeeb" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r355449 - head/sys/netinet Message-ID: <20191206220925.GJ2706@FreeBSD.org> References: <201912061635.xB6GZmpS042391@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201912061635.xB6GZmpS042391@repo.freebsd.org> User-Agent: Mutt/1.12.2 (2019-09-21) X-Rspamd-Queue-Id: 47V6FV34zSz3y2Z X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Dec 2019 22:09:34 -0000 Hi, there is a functional change here: On Fri, Dec 06, 2019 at 04:35:48PM +0000, Bjoern A. Zeeb wrote: B> URL: https://svnweb.freebsd.org/changeset/base/355449 B> B> Log: B> carp: replace caddr_t with char * B> B> Change the remaining caddr_t usages to char * following the removal B> of the KAME macros B> B> No functional change. ... B> @@ -978,6 +978,7 @@ carp_send_ad_locked(struct carp_softc *sc) B> #endif /* INET */ B> #ifdef INET6 B> if (sc->sc_naddrs6) { B> + struct epoch_tracker et; B> struct ip6_hdr *ip6; B> B> m = m_gethdr(M_NOWAIT, MT_DATA); B> @@ -1031,8 +1032,10 @@ carp_send_ad_locked(struct carp_softc *sc) B> B> CARPSTATS_INC(carps_opackets6); B> B> + NET_EPOCH_ENTER(et); B> carp_send_ad_error(sc, ip6_output(m, NULL, NULL, 0, B> &sc->sc_carpdev->if_carp->cif_im6o, NULL, NULL)); B> + NET_EPOCH_EXIT(et); B> } B> #endif /* INET6 */ This could be correct change, just needs some explanation. -- Gleb Smirnoff