Module Name: src
Committed By: yamaguchi
Date: Thu Mar 31 03:12:31 UTC 2022
Modified Files:
src/sys/net/lagg: if_lagg.c if_laggproto.c if_laggproto.h
Log Message:
Make lagg interface specified "laggproto none" able to up
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/net/lagg/if_lagg.c
cvs rdiff -u -r1.4 -r1.5 src/sys/net/lagg/if_laggproto.c
cvs rdiff -u -r1.12 -r1.13 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.40 src/sys/net/lagg/if_lagg.c:1.41
--- src/sys/net/lagg/if_lagg.c:1.40 Thu Mar 31 03:10:59 2022
+++ src/sys/net/lagg/if_lagg.c Thu Mar 31 03:12:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg.c,v 1.40 2022/03/31 03:10:59 yamaguchi Exp $ */
+/* $NetBSD: if_lagg.c,v 1.41 2022/03/31 03:12:31 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.40 2022/03/31 03:10:59 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.41 2022/03/31 03:12:31 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -86,7 +86,6 @@ static const struct lagg_proto lagg_prot
[LAGG_PROTO_NONE] = {
.pr_num = LAGG_PROTO_NONE,
.pr_attach = lagg_none_attach,
- .pr_up = lagg_none_up,
},
[LAGG_PROTO_LACP] = {
.pr_num = LAGG_PROTO_LACP,
Index: src/sys/net/lagg/if_laggproto.c
diff -u src/sys/net/lagg/if_laggproto.c:1.4 src/sys/net/lagg/if_laggproto.c:1.5
--- src/sys/net/lagg/if_laggproto.c:1.4 Thu Mar 31 03:05:41 2022
+++ src/sys/net/lagg/if_laggproto.c Thu Mar 31 03:12:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_laggproto.c,v 1.4 2022/03/31 03:05:41 yamaguchi Exp $ */
+/* $NetBSD: if_laggproto.c,v 1.5 2022/03/31 03:12:31 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.4 2022/03/31 03:05:41 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_laggproto.c,v 1.5 2022/03/31 03:12:31 yamaguchi Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -381,13 +381,6 @@ lagg_none_attach(struct lagg_softc *sc,
}
int
-lagg_none_up(struct lagg_proto_softc *psc __unused)
-{
-
- return EBUSY;
-}
-
-int
lagg_fail_attach(struct lagg_softc *sc, struct lagg_proto_softc **xpsc)
{
struct lagg_proto_softc *psc;
Index: src/sys/net/lagg/if_laggproto.h
diff -u src/sys/net/lagg/if_laggproto.h:1.12 src/sys/net/lagg/if_laggproto.h:1.13
--- src/sys/net/lagg/if_laggproto.h:1.12 Thu Mar 31 03:10:59 2022
+++ src/sys/net/lagg/if_laggproto.h Thu Mar 31 03:12:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_laggproto.h,v 1.12 2022/03/31 03:10:59 yamaguchi Exp $ */
+/* $NetBSD: if_laggproto.h,v 1.13 2022/03/31 03:12:31 yamaguchi Exp $ */
/*
* Copyright (c) 2021 Internet Initiative Japan Inc.
@@ -282,7 +282,6 @@ void lagg_common_linkstate(struct lagg_
int lagg_none_attach(struct lagg_softc *,
struct lagg_proto_softc **);
-int lagg_none_up(struct lagg_proto_softc *);
int lagg_fail_attach(struct lagg_softc *,
struct lagg_proto_softc **);
