Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757137AbcCURP5 (ORCPT ); Mon, 21 Mar 2016 13:15:57 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34566 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756160AbcCURPy (ORCPT ); Mon, 21 Mar 2016 13:15:54 -0400 From: David Decotigny To: "David S. Miller" , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Nikolay Aleksandrov , "Michael S. Tsirkin" , Ben Hutchings , Jeff Kirsher , David Decotigny , Nicolas Dichtel , Andrew Lunn , Hadar Hen Zion , Edward Cree , John Fastabend , Herbert Xu , Thomas Graf , Daniel Borkmann , Ken-ichirou MATSUZAWA , Florian Westphal , David Herrmann Subject: [PATCH net-next v2 2/2] netlink: add support for NIC driver ioctls Date: Mon, 21 Mar 2016 10:15:35 -0700 Message-Id: <1458580535-112916-3-git-send-email-ddecotig@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1458580535-112916-1-git-send-email-ddecotig@gmail.com> References: <1458580535-112916-1-git-send-email-ddecotig@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1430 Lines: 46 From: David Decotigny By returning -ENOIOCTLCMD, sock_do_ioctl() falls back to calling dev_ioctl(), which provides support for NIC driver ioctls, which includes ethtool support. This is similar to the way ioctls are handled in udp.c or tcp.c. This removes the requirement that ethtool for example be tied to the support of a specific L3 protocol (ethtool uses an AF_INET socket today). Signed-off-by: David Decotigny --- net/netlink/af_netlink.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index c841679..215fc08 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1033,6 +1033,14 @@ static int netlink_getname(struct socket *sock, struct sockaddr *addr, return 0; } +static int netlink_ioctl(struct socket *sock, unsigned int cmd, + unsigned long arg) +{ + /* try to hand this ioctl down to the NIC drivers. + */ + return -ENOIOCTLCMD; +} + static struct sock *netlink_getsockbyportid(struct sock *ssk, u32 portid) { struct sock *sock; @@ -2494,7 +2502,7 @@ static const struct proto_ops netlink_ops = { .accept = sock_no_accept, .getname = netlink_getname, .poll = datagram_poll, - .ioctl = sock_no_ioctl, + .ioctl = netlink_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, .setsockopt = netlink_setsockopt, -- 2.8.0.rc3.226.g39d4020