From patchwork Fri Nov 5 09:29:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12604385 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A88A7C433EF for ; Fri, 5 Nov 2021 09:30:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 865966124D for ; Fri, 5 Nov 2021 09:30:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232682AbhKEJck (ORCPT ); Fri, 5 Nov 2021 05:32:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:45530 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbhKEJch (ORCPT ); Fri, 5 Nov 2021 05:32:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B2CF96124D; Fri, 5 Nov 2021 09:29:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636104598; bh=tKBD+RLlfhE7VeZpMQSfNhzCQ40GPzXQUm0WWaajWiU=; h=From:To:Cc:Subject:Date:From; b=blJrmjedEf9wRzkN712Vm/D1FqePc61/3vF+cXYJKBSfZCTddSND6bALdvpydjdKo RI5oSKdgT1erbLNBISzhoa7HHvu+yBRvFy610vDyVbkx7Gaws+rguc/Q406/F1AFcQ pjcwctC8aYrrND2/H6UdqQLleGkNZwDFZ7dmMizBFFrFthQUDAqnAihEBztLDkOTVQ 7cYMtVopEIxUMkaCA2VMyTVAjUvffSsf0gvrsiVQlybU7xOaUOoyICkOM20KwiG4PR BBx6aFsWNwdOS1iXDmsFM++bcN88JwyK+kgqNMmqYHPobbAbENNrVfgIy7Dc0JqNci ihr5aq3iCrZ0w== From: Arnd Bergmann To: =?utf-8?q?=C5=81ukasz_Stelmach?= , "David S. Miller" , Jakub Kicinski , Jason Gunthorpe , Arnd Bergmann Cc: Nathan Chancellor , Alexander Lobakin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] ax88796c: fix ioctl callback Date: Fri, 5 Nov 2021 10:29:39 +0100 Message-Id: <20211105092954.1771974-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Arnd Bergmann The timestamp ioctls are now handled by the ndo_eth_ioctl() callback, not the old ndo_do_ioctl(), but oax88796 introduced the function for the old way. Move it over to ndo_eth_ioctl() to actually allow calling it from user space. Fixes: a97c69ba4f30 ("net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver") Fixes: a76053707dbf ("dev_ioctl: split out ndo_eth_ioctl") Signed-off-by: Arnd Bergmann Acked-by: Lukasz Stelmach --- It would be best to completely remove the .ndo_do_ioctl() callback to avoid this problem in the future, but I'm still unsure whether we want to just remove the ancient wireless and localtalk drivers instead of fixing them. --- drivers/net/ethernet/asix/ax88796c_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c index 4b0c5a09fd57..8994f2322268 100644 --- a/drivers/net/ethernet/asix/ax88796c_main.c +++ b/drivers/net/ethernet/asix/ax88796c_main.c @@ -934,7 +934,7 @@ static const struct net_device_ops ax88796c_netdev_ops = { .ndo_stop = ax88796c_close, .ndo_start_xmit = ax88796c_start_xmit, .ndo_get_stats64 = ax88796c_get_stats64, - .ndo_do_ioctl = ax88796c_ioctl, + .ndo_eth_ioctl = ax88796c_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_set_features = ax88796c_set_features, }; From patchwork Fri Nov 5 09:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12604387 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6E8EC433EF for ; Fri, 5 Nov 2021 09:30:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AE2D61265 for ; Fri, 5 Nov 2021 09:30:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232769AbhKEJcy (ORCPT ); Fri, 5 Nov 2021 05:32:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:45610 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230175AbhKEJcy (ORCPT ); Fri, 5 Nov 2021 05:32:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 744EB6124D; Fri, 5 Nov 2021 09:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636104608; bh=nC9kf7bs5KJzCx8ciQRMFgPzwKy9T7bzGzFAIYAfJRo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RHbCOcXwBjq4POD4qXhgSF3lOFVXSP/HCj/7xRMEZ9OX8lI1+YVP57BRGlccbb19o d0VYxeaTPFxjD7ls92TUtlpL5DxJGISqDk1EEbHi3ozKPmnOSUFgJgYDKS8OhsPw87 DNbjaWC0A1pLPSP7z56yg/oTCrsc28hciO3Gz2IhvG8oWc/m7rU7stndgf8tNq37tQ pYe5sX0Hcs+WJ3bEm1go7xupKznUFtFgrrzA1bz54cgN+A50PthRFrVHiKhKjqSk7s CGqczVEJ8qW9Xi9tjiQZrfCwuFnvQrNi9LibFVX1l53aGKB/Uw12Bx54pONUyK53jr 1CZG+RQnR6AHA== From: Arnd Bergmann To: Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , "David S. Miller" , Jakub Kicinski , Naveen Mamindlapalli , Jason Gunthorpe , Arnd Bergmann Cc: Rakesh Babu , Sunil Kovvuri Goutham , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] octeontx2-nicvf: fix ioctl callback Date: Fri, 5 Nov 2021 10:29:40 +0100 Message-Id: <20211105092954.1771974-2-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20211105092954.1771974-1-arnd@kernel.org> References: <20211105092954.1771974-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Arnd Bergmann The mii ioctls are now handled by the ndo_eth_ioctl() callback, not the old ndo_do_ioctl(), but octeontx2-nicvf introduced the function for the old way. Move it over to ndo_eth_ioctl() to actually allow calling it from user space. Fixes: 43510ef4ddad ("octeontx2-nicvf: Add PTP hardware clock support to NIX VF") Fixes: a76053707dbf ("dev_ioctl: split out ndo_eth_ioctl") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c index e6cb8cd0787d..78944ad3492f 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c @@ -501,7 +501,7 @@ static const struct net_device_ops otx2vf_netdev_ops = { .ndo_set_features = otx2vf_set_features, .ndo_get_stats64 = otx2_get_stats64, .ndo_tx_timeout = otx2_tx_timeout, - .ndo_do_ioctl = otx2_ioctl, + .ndo_eth_ioctl = otx2_ioctl, }; static int otx2_wq_init(struct otx2_nic *vf)