svn commit: r355449 - head/sys/netinet

[Bjoern A. Zeeb]

On 6 Dec 2019, at 22:09, Gleb Smirnoff wrote:

>    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.

Sorry.  My bad.  I had a patch from a different branch applied in 
between review and commit and forgot to clean up before committing.

I’ll put the epoch changes up for review the next hours/days.  I have 
reverted this part in the meantime in 355466.

Thanks for catching this.

/bz