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 7389E39280D for ; Sat, 13 Jun 2026 20:10:46 +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=1781381447; cv=none; b=sFxvorF5P54pe/lkcvcSJDq8Ya4BNqt8+CHuDPXS9Fxywmaptni6kJnh72xgjN8Qtyl6eBuIM6pDLp4FHqv4xBAXwBWQP2J4tzFi+/AipxWVc/hQV/W1LtxdOEpbKDWpbdi7w3b0JxfMyhpBM0falI6XPCI19r64lE73Pf2ZVQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781381447; c=relaxed/simple; bh=lsnQbP08v2He5GZptCkD5vProN6YUlhl+6oEVt4jRWk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sdCUaDBQ8MkEe8a//XmVm0mMrv+h8xGw0Bkxq4O68PaGwAY6301ewa5qNlW2NrNjcyiO3r7eRw9VSh/gniEUpyCNPZs6BZidFtKldM3P4mPPe8DF7ODdj5SvnuLSnt2y3HDGuXX0GO/DH/TIeWX+wC+/VM80oab/ISS0WFR2vHM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PGGLc6ix; 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="PGGLc6ix" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE5BA1F00A3A; Sat, 13 Jun 2026 20:10:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781381446; bh=6HgOp3TeKVWJZWSzUpcYmBXo3cvKi00BBAOH8MRDuxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PGGLc6ixuaXc62OgANMzXG+Uj5nin1brk8rfxf3y6p55CN3xAPQh844+Ob6q+Sw0z RYDm9LmDDaLQz1bvywc4zrlFKM9YM2mAspykycqViKX5JrSlFwtqQvrFL36ogI/B+J hTnj6pVLnjGLz2QDomNgsNAPwGI8ByaorR+vWRDQJj6T5WMu9lqmHgHujQRMdXYw/T re/hdnH/EO/JsgnnMqtx20MFah8hiQeeAJIWBPAkVvViFeUvmYRa8Ov7nN1SDcsS4w ZZZNXWIrSzMPnHVrUHjQDF/Pw7QhvmRSseLSyKDAertniqjvPHmaXJJM6E+/F9DDO0 F9ZRnwC6QFy3A== 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 6/9] atm: remove the unused change_qos device operation Date: Sat, 13 Jun 2026 13:10:29 -0700 Message-ID: <20260613201032.77274-7-kuba@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260613201032.77274-1-kuba@kernel.org> References: <20260613201032.77274-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 atmdev_ops::change_qos() was the hook for renegotiating the traffic parameters of an already-connected VCC, driven from SO_ATMQOS on a connected socket (and previously from the SVC as_modify path, now gone). None of the ATM drivers left in tree implement it - solos-pci only listed change_qos = NULL - so atm_change_qos() always returned -EOPNOTSUPP. Drop the operation and return -EOPNOTSUPP directly. Signed-off-by: Jakub Kicinski --- include/linux/atmdev.h | 1 - drivers/atm/solos-pci.c | 1 - net/atm/common.c | 25 ++----------------------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 59477676063c..218c05f2ec54 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -143,7 +143,6 @@ struct atmdev_ops { /* only send is required */ void (*phy_put)(struct atm_dev *dev,unsigned char value, unsigned long addr); unsigned char (*phy_get)(struct atm_dev *dev,unsigned long addr); - int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags); int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page); struct module *owner; }; diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 4ad170a858ee..9c246b956c30 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -1182,7 +1182,6 @@ static const struct atmdev_ops fpga_ops = { .send = psend, .phy_put = NULL, .phy_get = NULL, - .change_qos = NULL, .proc_read = NULL, .owner = THIS_MODULE }; diff --git a/net/atm/common.c b/net/atm/common.c index 650814d0a56c..44a0179d4586 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -673,28 +673,6 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait) return mask; } -static int atm_change_qos(struct atm_vcc *vcc, struct atm_qos *qos) -{ - int error; - - /* - * Don't let the QoS change the already connected AAL type nor the - * traffic class. - */ - if (qos->aal != vcc->qos.aal || - qos->rxtp.traffic_class != vcc->qos.rxtp.traffic_class || - qos->txtp.traffic_class != vcc->qos.txtp.traffic_class) - return -EINVAL; - error = adjust_tp(&qos->txtp, qos->aal); - if (!error) - error = adjust_tp(&qos->rxtp, qos->aal); - if (error) - return error; - if (!vcc->dev->ops->change_qos) - return -EOPNOTSUPP; - return vcc->dev->ops->change_qos(vcc, qos, ATM_MF_SET); -} - static int check_tp(const struct atm_trafprm *tp) { /* @@@ Should be merged with adjust_tp */ @@ -753,8 +731,9 @@ int vcc_setsockopt(struct socket *sock, int level, int optname, error = check_qos(&qos); if (error) return error; + /* QoS cannot be renegotiated on an already connected VCC. */ if (sock->state == SS_CONNECTED) - return atm_change_qos(vcc, &qos); + return -EOPNOTSUPP; if (sock->state != SS_UNCONNECTED) return -EBADFD; vcc->qos = qos; -- 2.54.0