From patchwork Thu Feb 12 15:03:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Ohly X-Patchwork-Id: 23033 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 B204CDDE26 for ; Fri, 13 Feb 2009 02:05:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760735AbZBLPEj (ORCPT ); Thu, 12 Feb 2009 10:04:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760778AbZBLPEi (ORCPT ); Thu, 12 Feb 2009 10:04:38 -0500 Received: from mga09.intel.com ([134.134.136.24]:6774 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760735AbZBLPEI (ORCPT ); Thu, 12 Feb 2009 10:04:08 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 12 Feb 2009 06:57:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,197,1233561600"; d="scan'208";a="489446283" Received: from ecld0pohly.ikn.intel.com (HELO localhost.localdomain) ([172.28.75.199]) by orsmga001.jf.intel.com with ESMTP; 12 Feb 2009 07:03:52 -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 09/10] igb: stub support for SIOCSHWTSTAMP Date: Thu, 12 Feb 2009 16:03:42 +0100 Message-Id: <1234451023-6505-9-git-send-email-patrick.ohly@intel.com> X-Mailer: git-send-email 1.6.1.2 In-Reply-To: <1234451023-6505-8-git-send-email-patrick.ohly@intel.com> References: <1234450981.5914.11.camel@ecld0pohly> <1234451023-6505-1-git-send-email-patrick.ohly@intel.com> <1234451023-6505-2-git-send-email-patrick.ohly@intel.com> <1234451023-6505-3-git-send-email-patrick.ohly@intel.com> <1234451023-6505-4-git-send-email-patrick.ohly@intel.com> <1234451023-6505-5-git-send-email-patrick.ohly@intel.com> <1234451023-6505-6-git-send-email-patrick.ohly@intel.com> <1234451023-6505-7-git-send-email-patrick.ohly@intel.com> <1234451023-6505-8-git-send-email-patrick.ohly@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: John Ronciak Signed-off-by: Patrick Ohly --- drivers/net/igb/igb_main.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 8b2ba42..90090bb 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -4182,6 +4183,34 @@ static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) } /** + * igb_hwtstamp_ioctl - control hardware time stamping + * @netdev: + * @ifreq: + * @cmd: + * + * Currently cannot enable any kind of hardware time stamping, but + * supports SIOCSHWTSTAMP in general. + **/ +static int igb_hwtstamp_ioctl(struct net_device *netdev, + struct ifreq *ifr, int cmd) +{ + struct hwtstamp_config config; + + if (copy_from_user(&config, ifr->ifr_data, sizeof(config))) + return -EFAULT; + + /* reserved for future extensions */ + if (config.flags) + return -EINVAL; + + if (config.tx_type == HWTSTAMP_TX_OFF && + config.rx_filter == HWTSTAMP_FILTER_NONE) + return 0; + + return -ERANGE; +} + +/** * igb_ioctl - * @netdev: * @ifreq: @@ -4194,6 +4223,8 @@ static int igb_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) case SIOCGMIIREG: case SIOCSMIIREG: return igb_mii_ioctl(netdev, ifr, cmd); + case SIOCSHWTSTAMP: + return igb_hwtstamp_ioctl(netdev, ifr, cmd); default: return -EOPNOTSUPP; }