From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C81D3AE193 for ; Mon, 15 Jun 2026 19:44:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781552661; cv=none; b=GNHBibtjNvXgIpg9V2pvMi8hJKAQCeR28XgFlvDas9JS6OS4yOuEDZIiruEgHydgwIlK8YbwkWpq6VD8w2NfeXIyYHN3Z2vgXcN1jCyEJ3ynlxVqo3FI3XmjvGGLm4bmYDG+xN5BLdMGBBMFQOn/Rn18P7D37Kgc8hwvu0yW6xA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781552661; c=relaxed/simple; bh=8YSR6CFEUKgEVbak/RzJf66YHaU4HqZ018p3ZNUz3NI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vi7jWPvak0uDlDYhMu7EVyRpPPMMN1oEmzwYqlQL84srpyaX7rU8RE2ql9MZ0i0yxGqF6P9QrvYhhgHXWj2E6NnIuEl3UaT6xe9rMwIz3d1A1BfN9Y84zGZfytFtRx44jyatfAyfXTw0sxige4vOsdBbp2RNw5cV+pXSmHJY1hM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G2/cIqLH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G2/cIqLH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 800D71F00A3A; Mon, 15 Jun 2026 19:44:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781552660; bh=O0u0Y5M06QrMQh3ALmuEJ2zJI1febqpd9gcTIM54ds4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G2/cIqLHb3zV5nBK7e6sy5CZd13aAf5qGqXWH5X60AuATfmmj0Lwb2GLOM+tF+uPz Vvbl6yqH+aYN83etvHQO1COgc2bYSV+uVsxdKHOSqq0ofA1jxheAe5+TuJYD4wdPi9 6yWTwngpykAJborG60AgsL+dQiQ6jx+C/Nz3dWqEJRfB6CZOCPReJ83vjyHyQ4F8H7 8qbQgM1MXavpPSyKH04WKYa5WsFZv9ZNOJn/i+DfmNwEyz0vC0Vc/jKR7GWZgSvZde n90cNBKiwO6ff5R6S/H9Eo+3P4jVpRoTAdIlBIwPD75oC44n88GC2jpNuUSpEBFzH0 DqHj/45fpqMEQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, 3chas3@gmail.com, mitch@sfgoth.com, linux-atm-general@lists.sourceforge.net, dwmw2@infradead.org, Jakub Kicinski Subject: [PATCH net-next v2 1/9] atm: remove AAL3/4 transport support Date: Mon, 15 Jun 2026 12:44:08 -0700 Message-ID: <20260615194416.752559-2-kuba@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260615194416.752559-1-kuba@kernel.org> References: <20260615194416.752559-1-kuba@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit AAL3/4 is an obsolete connection-oriented ATM adaptation layer that has seen no real use since the SMDS-era hardware it was designed for (90s?). We are only maintaining ATM support in-tree to keep PPPoATM running, and PPPoATM runs over AAL5. Drop the "raw" AAL3/4 transport (atm_init_aal34()) and the ATM_AAL34 cases in the connect and traffic-parameter paths. A vcc_connect() with qos.aal == ATM_AAL34 now fails with -EPROTOTYPE. uAPI cleanup is performed later, separately. Signed-off-by: Jakub Kicinski --- net/atm/protocols.h | 1 - net/atm/common.c | 7 ------- net/atm/raw.c | 12 ------------ 3 files changed, 20 deletions(-) diff --git a/net/atm/protocols.h b/net/atm/protocols.h index 18d4d008bac3..30158efb5e1a 100644 --- a/net/atm/protocols.h +++ b/net/atm/protocols.h @@ -8,7 +8,6 @@ #define NET_ATM_PROTOCOLS_H int atm_init_aal0(struct atm_vcc *vcc); /* "raw" AAL0 */ -int atm_init_aal34(struct atm_vcc *vcc);/* "raw" AAL3/4 transport */ int atm_init_aal5(struct atm_vcc *vcc); /* "raw" AAL5 transport */ #endif diff --git a/net/atm/common.c b/net/atm/common.c index 60132de4eebe..913f7e32ce41 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -293,9 +293,6 @@ static int adjust_tp(struct atm_trafprm *tp, unsigned char aal) case ATM_AAL0: max_sdu = ATM_CELL_SIZE-1; break; - case ATM_AAL34: - max_sdu = ATM_MAX_AAL34_PDU; - break; default: pr_warn("AAL problems ... (%d)\n", aal); fallthrough; @@ -411,10 +408,6 @@ static int __vcc_connect(struct atm_vcc *vcc, struct atm_dev *dev, short vpi, error = atm_init_aal0(vcc); vcc->stats = &dev->stats.aal0; break; - case ATM_AAL34: - error = atm_init_aal34(vcc); - vcc->stats = &dev->stats.aal34; - break; case ATM_NO_AAL: /* ATM_AAL5 is also used in the "0 for default" case */ vcc->qos.aal = ATM_AAL5; diff --git a/net/atm/raw.c b/net/atm/raw.c index 1e6511ec842c..0d36aeb3671b 100644 --- a/net/atm/raw.c +++ b/net/atm/raw.c @@ -68,18 +68,6 @@ int atm_init_aal0(struct atm_vcc *vcc) return 0; } -int atm_init_aal34(struct atm_vcc *vcc) -{ - vcc->push = atm_push_raw; - vcc->pop = atm_pop_raw; - vcc->push_oam = NULL; - if (vcc->dev->ops->send_bh) - vcc->send = vcc->dev->ops->send_bh; - else - vcc->send = vcc->dev->ops->send; - return 0; -} - int atm_init_aal5(struct atm_vcc *vcc) { vcc->push = atm_push_raw; -- 2.54.0