Module Name: src Committed By: yamaguchi Date: Thu Mar 31 07:59:05 UTC 2022
Modified Files: src/sys/net/lagg: if_lagg.c if_lagg_lacp.c if_laggproto.c if_laggproto.h Log Message: rename lagg_enqueue to lagg_output NFC To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/net/lagg/if_lagg.c cvs rdiff -u -r1.20 -r1.21 src/sys/net/lagg/if_lagg_lacp.c cvs rdiff -u -r1.5 -r1.6 src/sys/net/lagg/if_laggproto.c cvs rdiff -u -r1.14 -r1.15 src/sys/net/lagg/if_laggproto.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/net/lagg/if_lagg.c diff -u src/sys/net/lagg/if_lagg.c:1.43 src/sys/net/lagg/if_lagg.c:1.44 --- src/sys/net/lagg/if_lagg.c:1.43 Thu Mar 31 03:21:33 2022 +++ src/sys/net/lagg/if_lagg.c Thu Mar 31 07:59:05 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_lagg.c,v 1.43 2022/03/31 03:21:33 yamaguchi Exp $ */ +/* $NetBSD: if_lagg.c,v 1.44 2022/03/31 07:59:05 yamaguchi Exp $ */ /* * Copyright (c) 2005, 2006 Reyk Floeter <r...@openbsd.org> @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.43 2022/03/31 03:21:33 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.44 2022/03/31 07:59:05 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1041,7 +1041,7 @@ lagg_start(struct ifnet *ifp) } void -lagg_enqueue(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) +lagg_output(struct lagg_softc *sc, struct lagg_port *lp, struct mbuf *m) { struct ifnet *ifp; int len, error; Index: src/sys/net/lagg/if_lagg_lacp.c diff -u src/sys/net/lagg/if_lagg_lacp.c:1.20 src/sys/net/lagg/if_lagg_lacp.c:1.21 --- src/sys/net/lagg/if_lagg_lacp.c:1.20 Thu Mar 31 03:15:15 2022 +++ src/sys/net/lagg/if_lagg_lacp.c Thu Mar 31 07:59:05 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_lagg_lacp.c,v 1.20 2022/03/31 03:15:15 yamaguchi Exp $ */ +/* $NetBSD: if_lagg_lacp.c,v 1.21 2022/03/31 07:59:05 yamaguchi Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.20 2022/03/31 03:15:15 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lagg_lacp.c,v 1.21 2022/03/31 07:59:05 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_lagg.h" @@ -647,7 +647,7 @@ lacp_transmit(struct lagg_proto_softc *x return ENOENT; } - lagg_enqueue(lsc->lsc_softc, lp, m); + lagg_output(lsc->lsc_softc, lp, m); lagg_port_putref(lp, &psref); return 0; Index: src/sys/net/lagg/if_laggproto.c diff -u src/sys/net/lagg/if_laggproto.c:1.5 src/sys/net/lagg/if_laggproto.c:1.6 --- src/sys/net/lagg/if_laggproto.c:1.5 Thu Mar 31 03:12:31 2022 +++ src/sys/net/lagg/if_laggproto.c Thu Mar 31 07:59:05 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_laggproto.c,v 1.5 2022/03/31 03:12:31 yamaguchi Exp $ */ +/* $NetBSD: if_laggproto.c,v 1.6 2022/03/31 07:59:05 yamaguchi Exp $ */ /*- * SPDX-License-Identifier: BSD-2-Clause-NetBSD @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_laggproto.c,v 1.5 2022/03/31 03:12:31 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_laggproto.c,v 1.6 2022/03/31 07:59:05 yamaguchi Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -412,7 +412,7 @@ lagg_fail_transmit(struct lagg_proto_sof return ENOENT; } - lagg_enqueue(psc->psc_softc, lp, m); + lagg_output(psc->psc_softc, lp, m); lagg_port_putref(lp, &psref); return 0; } @@ -613,7 +613,7 @@ lagg_lb_transmit(struct lagg_proto_softc return ENOENT; } - lagg_enqueue(psc->psc_softc, lp, m); + lagg_output(psc->psc_softc, lp, m); lagg_port_putref(lp, &psref); return 0; Index: src/sys/net/lagg/if_laggproto.h diff -u src/sys/net/lagg/if_laggproto.h:1.14 src/sys/net/lagg/if_laggproto.h:1.15 --- src/sys/net/lagg/if_laggproto.h:1.14 Thu Mar 31 03:15:15 2022 +++ src/sys/net/lagg/if_laggproto.h Thu Mar 31 07:59:05 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: if_laggproto.h,v 1.14 2022/03/31 03:15:15 yamaguchi Exp $ */ +/* $NetBSD: if_laggproto.h,v 1.15 2022/03/31 07:59:05 yamaguchi Exp $ */ /* * Copyright (c) 2021 Internet Initiative Japan Inc. @@ -280,7 +280,7 @@ lagg_debug_enable(struct lagg_softc *sc) void lagg_port_getref(struct lagg_port *, struct psref *); void lagg_port_putref(struct lagg_port *, struct psref *); -void lagg_enqueue(struct lagg_softc *, +void lagg_output(struct lagg_softc *, struct lagg_port *, struct mbuf *); uint32_t lagg_hashmbuf(struct lagg_softc *, struct mbuf *);