From patchwork Wed Mar 25 08:13:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramkrishna Vepa X-Patchwork-Id: 25060 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 059B8DDFCA for ; Wed, 25 Mar 2009 18:31:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758734AbZCYH3Q (ORCPT ); Wed, 25 Mar 2009 03:29:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758681AbZCYH3O (ORCPT ); Wed, 25 Mar 2009 03:29:14 -0400 Received: from barracuda.s2io.com ([72.1.205.138]:43837 "EHLO barracuda.s2io.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758714AbZCYH3E (ORCPT ); Wed, 25 Mar 2009 03:29:04 -0400 X-ASG-Debug-ID: 1237966139-449300fa0000-gSecQ8 X-Barracuda-URL: http://72.1.205.138:8000/cgi-bin/mark.cgi Received: from guinness.s2io.com (localhost [127.0.0.1]) by barracuda.s2io.com (Spam Firewall) with ESMTP id 2B88020DE6F1; Wed, 25 Mar 2009 03:28:59 -0400 (EDT) Received: from guinness.s2io.com (142-46-210.147.tel-ott.com [142.46.210.147]) by barracuda.s2io.com with ESMTP id nHHfEj2kvprFX3m8; Wed, 25 Mar 2009 03:28:59 -0400 (EDT) X-Barracuda-Envelope-From: ram.vepa@neterion.com X-ASG-Whitelist: Client Received: from [10.16.17.101] ([10.16.17.101]) by guinness.s2io.com (8.12.6/8.12.6) with ESMTP id n2P7SvAV029586; Wed, 25 Mar 2009 03:28:58 -0400 (EDT) X-ASG-Orig-Subj: [net-2.6 PATCH 10/10] Neterion: New driver: Kconfig and Makefile Subject: [net-2.6 PATCH 10/10] Neterion: New driver: Kconfig and Makefile From: Ramkrishna Vepa Reply-To: ram.vepa@neterion.com To: David Miller Cc: Netdev , Ramkrishna Vepa Organization: Neterion Inc Message-Id: <1237968828.1655.280.camel@flash> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) Date: 25 Mar 2009 00:13:48 -0800 X-Barracuda-Connect: 142-46-210.147.tel-ott.com[142.46.210.147] X-Barracuda-Start-Time: 1237966139 X-Barracuda-Virus-Scanned: by Barracuda Spam Firewall at s2io.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org - Kconfig and Makefile related changes for vxge driver. - Changes from previous submission - - Incorporated the following review comments as per Bill Flink: - Add dependancy on INET along with PCI - Remove dependancy on INET_LRO and add GRO support. - Made this patch as last patch as per Ben Hutchings comments. Signed-off-by: Sivakumar Subramani Signed-off-by: Rastapur Santosh Signed-off-by: Ramkrishna Vepa --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -Nurp patch_9/drivers/net/Kconfig patch_10/drivers/net/Kconfig --- patch_9/drivers/net/Kconfig 2009-03-23 09:48:47.000000000 -0700 +++ patch_10/drivers/net/Kconfig 2009-03-23 09:40:29.000000000 -0700 @@ -2531,6 +2531,23 @@ config S2IO More specific information on configuring the driver is in . +config VXGE + tristate "Neterion X3100 Series 10GbE PCIe Server Adapter" + depends on PCI && INET + ---help--- + This driver supports Neterion Inc's X3100 Series 10 GbE PCIe + I/O Virtualized Server Adapter. + More specific information on configuring the driver is in + . + +config VXGE_DEBUG_TRACE_ALL + bool "Enabling All Debug trace statments in driver" + default n + depends on VXGE + ---help--- + Say Y here if you want to enabling all the debug trace statements in + driver. By default only few debug trace statements are enabled. + config MYRI10GE tristate "Myricom Myri-10G Ethernet support" depends on PCI && INET diff -Nurp patch_9/drivers/net/Makefile patch_10/drivers/net/Makefile --- patch_9/drivers/net/Makefile 2009-03-23 09:17:41.000000000 -0700 +++ patch_10/drivers/net/Makefile 2009-03-23 09:17:41.000000000 -0700 @@ -219,6 +219,7 @@ obj-$(CONFIG_R8169) += r8169.o obj-$(CONFIG_AMD8111_ETH) += amd8111e.o obj-$(CONFIG_IBMVETH) += ibmveth.o obj-$(CONFIG_S2IO) += s2io.o +obj-$(CONFIG_VXGE) += vxge/ obj-$(CONFIG_MYRI10GE) += myri10ge/ obj-$(CONFIG_SMC91X) += smc91x.o obj-$(CONFIG_SMC911X) += smc911x.o diff -Nurp patch_9/drivers/net/vxge/Makefile patch_10/drivers/net/vxge/Makefile --- patch_9/drivers/net/vxge/Makefile 1969-12-31 16:00:00.000000000 -0800 +++ patch_10/drivers/net/vxge/Makefile 2009-03-23 09:17:41.000000000 -0700 @@ -0,0 +1,7 @@ +# +# Makefile for Neterion Inc's X3100 Series 10 GbE PCIe # I/O +# Virtualized Server Adapter linux driver + +obj-$(CONFIG_VXGE) += vxge.o + +vxge-objs := vxge-config.o vxge-traffic.o vxge-ethtool.o vxge-main.o