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-message
Regards,
Kevin
On Mon, Jun 21, 2021 at 7:50 AM George V. Neville-Neil
<[email protected]> wrote:
The branch main has been updated by gnn:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c6b2d024d7eedbf32f52a17bc029c92f5a4d1a54
commit c6b2d024d7eedbf32f52a17bc029c92f5a4d1a54
Author: George V. Neville-Neil <[email protected]>
AuthorDate: 2021-06-21 14:46:20 +0000
Commit: George V. Neville-Neil <[email protected]>
CommitDate: 2021-06-21 14:46:20 +0000
Retore the vnet before returning an error.
Obtained from: Kanndula, Dheeraj <[email protected]>
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 = malloc(sizeof(struct vlan_mc_entry), M_VLAN,
M_NOWAIT);
if (mc == 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 = if_addmulti(ifp_p, (struct sockaddr
*)&mc->mc_addr,
NULL);
- if (error)
+ if (error) {
+ CURVNET_RESTORE();
return (error);
+ }
}
CURVNET_RESTORE();
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to
"[email protected]"
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "[email protected]"