From patchwork Thu Feb 12 15:00:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Ohly X-Patchwork-Id: 23021 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BD516DDDDE for ; Fri, 13 Feb 2009 02:01:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756806AbZBLPAy (ORCPT ); Thu, 12 Feb 2009 10:00:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759570AbZBLPAk (ORCPT ); Thu, 12 Feb 2009 10:00:40 -0500 Received: from mga09.intel.com ([134.134.136.24]:27453 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758946AbZBLPAd (ORCPT ); Thu, 12 Feb 2009 10:00:33 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 12 Feb 2009 06:53:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,197,1233561600"; d="scan'208";a="386251291" Received: from ecld0pohly.ikn.intel.com (HELO localhost.localdomain) ([172.28.75.199]) by orsmga002.jf.intel.com with ESMTP; 12 Feb 2009 07:09:23 -0800 From: Patrick Ohly To: David Miller Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, John Stultz , John Ronciak , Patrick Ohly Subject: [PATCH NET-NEXT 07/10] net: pass new SIOCSHWTSTAMP through to device drivers Date: Thu, 12 Feb 2009 16:00:09 +0100 Message-Id: <1234450812-6246-7-git-send-email-patrick.ohly@intel.com> X-Mailer: git-send-email 1.6.1.2 In-Reply-To: <1234450812-6246-6-git-send-email-patrick.ohly@intel.com> References: <1234450670.5914.9.camel@ecld0pohly> <1234450812-6246-1-git-send-email-patrick.ohly@intel.com> <1234450812-6246-2-git-send-email-patrick.ohly@intel.com> <1234450812-6246-3-git-send-email-patrick.ohly@intel.com> <1234450812-6246-4-git-send-email-patrick.ohly@intel.com> <1234450812-6246-5-git-send-email-patrick.ohly@intel.com> <1234450812-6246-6-git-send-email-patrick.ohly@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org --- fs/compat_ioctl.c | 6 ++++++ net/core/dev.c | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c03c10d..ab7585a 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -522,6 +522,11 @@ static int dev_ifsioc(unsigned int fd, unsigned int cmd, unsigned long arg) if (err) return -EFAULT; break; + case SIOCSHWTSTAMP: + if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) + return -EFAULT; + ifr.ifr_data = compat_ptr(uifr32->ifr_ifru.ifru_data); + break; default: if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) return -EFAULT; @@ -2563,6 +2568,7 @@ HANDLE_IOCTL(SIOCSIFMAP, dev_ifsioc) HANDLE_IOCTL(SIOCGIFADDR, dev_ifsioc) HANDLE_IOCTL(SIOCSIFADDR, dev_ifsioc) HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc) +HANDLE_IOCTL(SIOCSHWTSTAMP, dev_ifsioc) /* ioctls used by appletalk ddp.c */ HANDLE_IOCTL(SIOCATALKDIFADDR, dev_ifsioc) diff --git a/net/core/dev.c b/net/core/dev.c index d20c28e..d393fc9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4019,6 +4019,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd) cmd == SIOCSMIIREG || cmd == SIOCBRADDIF || cmd == SIOCBRDELIF || + cmd == SIOCSHWTSTAMP || cmd == SIOCWANDEV) { err = -EOPNOTSUPP; if (ops->ndo_do_ioctl) { @@ -4173,6 +4174,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, void __user *arg) case SIOCBONDCHANGEACTIVE: case SIOCBRADDIF: case SIOCBRDELIF: + case SIOCSHWTSTAMP: if (!capable(CAP_NET_ADMIN)) return -EPERM; /* fall through */