From owner-dev-commits-src-main@freebsd.org Fri Jul 2 00:29:26 2021 Return-Path: Delivered-To: dev-commits-src-main@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 BEC79657BE3; Fri, 2 Jul 2021 00:29:26 +0000 (UTC) (envelope-from gnn@freebsd.org) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4GGGDQ2MGlz3nnd; Fri, 2 Jul 2021 00:29:25 +0000 (UTC) (envelope-from gnn@freebsd.org) Received: (Authenticated sender: gnn@neville-neil.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 55A6A240004; Fri, 2 Jul 2021 00:29:21 +0000 (UTC) From: George Neville-Neil To: Kevin Bowling Cc: src-committers , dev-commits-src-all@freebsd.org, "dev-commits-src-main@FreeBSD.org" Subject: Re: git: c6b2d024d7ee - main - Retore the vnet before returning an error. Date: Thu, 01 Jul 2021 17:29:17 -0700 X-Mailer: MailMate (1.14r5798) Message-ID: <296A20BE-34D2-400F-944E-306FC19B6B84@freebsd.org> In-Reply-To: References: <202106211449.15LEnsxM086627@gitrepo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; format=flowed Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4GGGDQ2MGlz3nnd X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jul 2021 00:29:26 -0000 Good to know. Thanks, George On 1 Jul 2021, at 11:32, Kevin Bowling wrote: > Hi George, > > After the git transition we use the commit author field itself to > communicate authorship. The obtained field should say Netapp, Inc. > See section 9.14 > https://docs.freebsd.org/en/articles/committers-guide/#commit-log-messa= ge > > Regards, > Kevin > > On Mon, Jun 21, 2021 at 7:50 AM George V. Neville-Neil = > wrote: >> >> The branch main has been updated by gnn: >> >> URL: = >> https://cgit.FreeBSD.org/src/commit/?id=3Dc6b2d024d7eedbf32f52a17bc029= c92f5a4d1a54 >> >> commit c6b2d024d7eedbf32f52a17bc029c92f5a4d1a54 >> Author: George V. Neville-Neil >> AuthorDate: 2021-06-21 14:46:20 +0000 >> Commit: George V. Neville-Neil >> CommitDate: 2021-06-21 14:46:20 +0000 >> >> Retore the vnet before returning an error. >> >> Obtained from: Kanndula, Dheeraj >> MFC after: 2 weeks >> Differential Revision: https://reviews.freebsd.org/D30741 >> --- >> sys/net/if_vlan.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c >> index bd3a5335a97f..39f767c2a603 100644 >> --- a/sys/net/if_vlan.c >> +++ b/sys/net/if_vlan.c >> @@ -609,6 +609,7 @@ vlan_setmulti(struct ifnet *ifp) >> mc =3D malloc(sizeof(struct vlan_mc_entry), M_VLAN, = >> M_NOWAIT); >> if (mc =3D=3D NULL) { >> IF_ADDR_WUNLOCK(ifp); >> + CURVNET_RESTORE(); >> return (ENOMEM); >> } >> bcopy(ifma->ifma_addr, &mc->mc_addr, = >> ifma->ifma_addr->sa_len); >> @@ -619,8 +620,10 @@ vlan_setmulti(struct ifnet *ifp) >> CK_SLIST_FOREACH (mc, &sc->vlan_mc_listhead, mc_entries) { >> error =3D if_addmulti(ifp_p, (struct sockaddr = >> *)&mc->mc_addr, >> NULL); >> - if (error) >> + if (error) { >> + CURVNET_RESTORE(); >> return (error); >> + } >> } >> >> CURVNET_RESTORE(); >> _______________________________________________ >> dev-commits-src-main@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main >> To unsubscribe, send any mail to = >> "dev-commits-src-main-unsubscribe@freebsd.org"