From 08a5f8c5cbc7143601a34ac7e52831e996a9347e Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 3 Mar 2023 16:20:18 +0000 Subject: [PATCH] NgATM: deprecate Support for ATM NICs was removed prior to FreeBSD 12. At the time it was unclear if this code was still useful without it. Now the time has come to finish removing support. Add DREPRECATION NOTICEs to the manpages and gone_in(14, ...) warnings in the constructors (or module init for ngatmbase). Reviewed by: manu, emaste Relnotes: yes Differential Revision: https://reviews.freebsd.org/D38877 (cherry picked from commit 211c302f10d76fc12e50c87039cfc06aa9e659c1) --- share/man/man4/ng_ccatm.4 | 7 ++++++- share/man/man4/ng_sscfu.4 | 7 ++++++- share/man/man4/ng_sscop.4 | 7 ++++++- share/man/man4/ng_uni.4 | 7 ++++++- share/man/man4/ngatmbase.4 | 7 ++++++- sys/netgraph/atm/ccatm/ng_ccatm.c | 2 ++ sys/netgraph/atm/ngatmbase.c | 2 ++ sys/netgraph/atm/sscfu/ng_sscfu.c | 2 ++ sys/netgraph/atm/sscop/ng_sscop.c | 2 ++ sys/netgraph/atm/uni/ng_uni.c | 2 ++ 10 files changed, 40 insertions(+), 5 deletions(-) diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index 3d6778fa25d..02a5a5f011b 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 10, 2005 +.Dd March 3, 2023 .Dt NG_CCATM 4 .Os .Sh NAME @@ -47,6 +47,11 @@ .In netgraph.h .In netgraph/ng_uni.h .In netgraph/ng_ccatm.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/ng_sscfu.4 b/share/man/man4/ng_sscfu.4 index 2c444dacd58..6011deaeb2b 100644 --- a/share/man/man4/ng_sscfu.4 +++ b/share/man/man4/ng_sscfu.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscfu(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCFU 4 .Os .Sh NAME @@ -40,6 +40,11 @@ .In netnatm/saal/sscopdef.h .In netnatm/saal/sscfudef.h .In netgraph/atm/ng_sscfu.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscfu diff --git a/share/man/man4/ng_sscop.4 b/share/man/man4/ng_sscop.4 index c98a4346258..451edcc4aeb 100644 --- a/share/man/man4/ng_sscop.4 +++ b/share/man/man4/ng_sscop.4 @@ -30,7 +30,7 @@ .\" .\" ng_sscop(4) man page .\" -.Dd October 24, 2003 +.Dd March 3, 2023 .Dt NG_SSCOP 4 .Os .Sh NAME @@ -39,6 +39,11 @@ .Sh SYNOPSIS .In netnatm/saal/sscopdef.h .In netgraph/atm/ng_sscop.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm sscop diff --git a/share/man/man4/ng_uni.4 b/share/man/man4/ng_uni.4 index da7028b0e01..993119d23c7 100644 --- a/share/man/man4/ng_uni.4 +++ b/share/man/man4/ng_uni.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 6, 2003 +.Dd March 3, 2023 .Dt NG_UNI 4 .Os .Sh NAME @@ -38,6 +38,11 @@ .In netnatm/msg/unistruct.h .In netnatm/sig/unidef.h .In netgraph/atm/ng_uni.h +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh DESCRIPTION The .Nm uni diff --git a/share/man/man4/ngatmbase.4 b/share/man/man4/ngatmbase.4 index 0227b44347b..6cdc3eb532f 100644 --- a/share/man/man4/ngatmbase.4 +++ b/share/man/man4/ngatmbase.4 @@ -30,9 +30,14 @@ .\" .\" ngatmbase(4) man page .\" -.Dd August 24, 2004 +.Dd March 3, 2023 .Dt NGATMBASE 4 .Os +.Sh DEPRECATION NOTICE +.Nm +is deprecated and may not be available in +.Fx 14.0 +and later. .Sh NAME .Nm ngatmbase .Nd netgraph ATM utility module diff --git a/sys/netgraph/atm/ccatm/ng_ccatm.c b/sys/netgraph/atm/ccatm/ng_ccatm.c index 6c27b6aacc0..4a7af2c4579 100644 --- a/sys/netgraph/atm/ccatm/ng_ccatm.c +++ b/sys/netgraph/atm/ccatm/ng_ccatm.c @@ -348,6 +348,8 @@ ng_ccatm_constructor(node_p node) { struct ccnode *priv; + gone_in(14, "ng_ccatm: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_CCATM, M_WAITOK | M_ZERO); priv->node = node; diff --git a/sys/netgraph/atm/ngatmbase.c b/sys/netgraph/atm/ngatmbase.c index 785bbef2658..0e2d1597d69 100644 --- a/sys/netgraph/atm/ngatmbase.c +++ b/sys/netgraph/atm/ngatmbase.c @@ -77,6 +77,8 @@ static struct mtx ngatm_unilist_mtx; static void uni_msg_init(void) { + gone_in(14, "ngatmbase: netgraph ATM modules"); + mtx_init(&ngatm_unilist_mtx, "netgraph UNI msg header lists", NULL, MTX_DEF); } diff --git a/sys/netgraph/atm/sscfu/ng_sscfu.c b/sys/netgraph/atm/sscfu/ng_sscfu.c index 7fe3728b7ea..4811f576df0 100644 --- a/sys/netgraph/atm/sscfu/ng_sscfu.c +++ b/sys/netgraph/atm/sscfu/ng_sscfu.c @@ -536,6 +536,8 @@ ng_sscfu_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_sscfu: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_SSCFU, M_WAITOK | M_ZERO); if ((priv->sscf = sscfu_create(node, &sscfu_funcs)) == NULL) { diff --git a/sys/netgraph/atm/sscop/ng_sscop.c b/sys/netgraph/atm/sscop/ng_sscop.c index b15ef5e258a..ae60e755797 100644 --- a/sys/netgraph/atm/sscop/ng_sscop.c +++ b/sys/netgraph/atm/sscop/ng_sscop.c @@ -246,6 +246,8 @@ ng_sscop_constructor(node_p node) { struct priv *p; + gone_in(14, "ng_sscop: netgraph ATM modules"); + p = malloc(sizeof(*p), M_NG_SSCOP, M_WAITOK | M_ZERO); if ((p->sscop = sscop_create(node, &sscop_funcs)) == NULL) { diff --git a/sys/netgraph/atm/uni/ng_uni.c b/sys/netgraph/atm/uni/ng_uni.c index c4e1c2c523b..1313bd06218 100644 --- a/sys/netgraph/atm/uni/ng_uni.c +++ b/sys/netgraph/atm/uni/ng_uni.c @@ -225,6 +225,8 @@ ng_uni_constructor(node_p node) { struct priv *priv; + gone_in(14, "ng_uni: netgraph ATM modules"); + priv = malloc(sizeof(*priv), M_NG_UNI, M_WAITOK | M_ZERO); if ((priv->uni = uni_create(node, &uni_funcs)) == NULL) { -- 2.45.0