From patchwork Sat Aug 27 09:55:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 111860 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 69B64B6FD7 for ; Sat, 27 Aug 2011 19:55:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751229Ab1H0Jz2 (ORCPT ); Sat, 27 Aug 2011 05:55:28 -0400 Received: from mga11.intel.com ([192.55.52.93]:42842 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750838Ab1H0JzW (ORCPT ); Sat, 27 Aug 2011 05:55:22 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 27 Aug 2011 02:55:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,289,1312182000"; d="scan'208";a="45585233" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.14.23]) by fmsmga001.fm.intel.com with ESMTP; 27 Aug 2011 02:55:20 -0700 From: Jeff Kirsher To: davem@davemloft.net Cc: Jeff Kirsher , netdev@vger.kernel.org, gospo@redhat.com, Jes Sorensen , Jes Sorensen Subject: [net-next 04/10] hippi: Move the HIPPI driver Date: Sat, 27 Aug 2011 02:55:10 -0700 Message-Id: <1314438916-2478-5-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1314438916-2478-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1314438916-2478-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move the HIPPI driver into drivers/net/hippi/ and make the necessary Kconfig and Makefile changes. CC: Jes Sorensen CC: Jes Sorensen Signed-off-by: Jeff Kirsher --- MAINTAINERS | 1 + drivers/net/Kconfig | 32 ------------------------------ drivers/net/Makefile | 2 +- drivers/net/hippi/Kconfig | 39 +++++++++++++++++++++++++++++++++++++ drivers/net/hippi/Makefile | 5 ++++ drivers/net/{ => hippi}/rrunner.c | 0 drivers/net/{ => hippi}/rrunner.h | 0 7 files changed, 46 insertions(+), 33 deletions(-) create mode 100644 drivers/net/hippi/Kconfig create mode 100644 drivers/net/hippi/Makefile rename drivers/net/{ => hippi}/rrunner.c (100%) rename drivers/net/{ => hippi}/rrunner.h (100%) diff --git a/drivers/net/rrunner.c b/drivers/net/hippi/rrunner.c similarity index 100% rename from drivers/net/rrunner.c rename to drivers/net/hippi/rrunner.c diff --git a/drivers/net/rrunner.h b/drivers/net/hippi/rrunner.h similarity index 100% rename from drivers/net/rrunner.h rename to drivers/net/hippi/rrunner.h diff --git a/MAINTAINERS b/MAINTAINERS index c5ec925..194095a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3049,6 +3049,7 @@ S: Maintained F: include/linux/hippidevice.h F: include/linux/if_hippi.h F: net/802/hippi.c +F: drivers/net/hippi/ HOST AP DRIVER M: Jouni Malinen diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c5e2a38..1d8fa95 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -272,38 +272,6 @@ config RIONET_RX_SIZE depends on RIONET default "128" -config HIPPI - bool "HIPPI driver support (EXPERIMENTAL)" - depends on EXPERIMENTAL && INET && PCI - help - HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and - 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI - can run over copper (25m) or fiber (300m on multi-mode or 10km on - single-mode). HIPPI networks are commonly used for clusters and to - connect to super computers. If you are connected to a HIPPI network - and have a HIPPI network card in your computer that you want to use - under Linux, say Y here (you must also remember to enable the driver - for your HIPPI card below). Most people will say N here. - -config ROADRUNNER - tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)" - depends on HIPPI && PCI - help - Say Y here if this is your PCI HIPPI network card. - - To compile this driver as a module, choose M here: the module - will be called rrunner. If unsure, say N. - -config ROADRUNNER_LARGE_RINGS - bool "Use large TX/RX rings (EXPERIMENTAL)" - depends on ROADRUNNER - help - If you say Y here, the RoadRunner driver will preallocate up to 2 MB - of additional memory to allow for fastest operation, both for - transmitting and receiving. This memory cannot be used by any other - kernel code or by user space programs. Say Y here only if you have - the memory. - config PLIP tristate "PLIP (parallel port) support" depends on PARPORT diff --git a/drivers/net/Makefile b/drivers/net/Makefile index a397f1e..f64d02c 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -13,7 +13,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/ # link order important here # obj-$(CONFIG_PLIP) += plip.o -obj-$(CONFIG_ROADRUNNER) += rrunner.o obj-$(CONFIG_RIONET) += rionet.o # @@ -39,6 +38,7 @@ obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ obj-$(CONFIG_FDDI) += fddi/ +obj-$(CONFIG_HIPPI) += hippi/ onj-$(CONFIG_PPP) += ppp/ obj-$(CONFIG_PPP_ASYNC) += ppp/ obj-$(CONFIG_PPP_BSDCOMP) += ppp/ diff --git a/drivers/net/hippi/Kconfig b/drivers/net/hippi/Kconfig new file mode 100644 index 0000000..7393eb7 --- /dev/null +++ b/drivers/net/hippi/Kconfig @@ -0,0 +1,39 @@ +# +# HIPPI network device configuration +# + +config HIPPI + bool "HIPPI driver support (EXPERIMENTAL)" + depends on EXPERIMENTAL && INET && PCI + ---help--- + HIgh Performance Parallel Interface (HIPPI) is a 800Mbit/sec and + 1600Mbit/sec dual-simplex switched or point-to-point network. HIPPI + can run over copper (25m) or fiber (300m on multi-mode or 10km on + single-mode). HIPPI networks are commonly used for clusters and to + connect to super computers. If you are connected to a HIPPI network + and have a HIPPI network card in your computer that you want to use + under Linux, say Y here (you must also remember to enable the driver + for your HIPPI card below). Most people will say N here. + +if HIPPI + +config ROADRUNNER + tristate "Essential RoadRunner HIPPI PCI adapter support (EXPERIMENTAL)" + depends on PCI + ---help--- + Say Y here if this is your PCI HIPPI network card. + + To compile this driver as a module, choose M here: the module + will be called rrunner. If unsure, say N. + +config ROADRUNNER_LARGE_RINGS + bool "Use large TX/RX rings (EXPERIMENTAL)" + depends on ROADRUNNER + ---help--- + If you say Y here, the RoadRunner driver will preallocate up to 2 MB + of additional memory to allow for fastest operation, both for + transmitting and receiving. This memory cannot be used by any other + kernel code or by user space programs. Say Y here only if you have + the memory. + +endif /* HIPPI */ diff --git a/drivers/net/hippi/Makefile b/drivers/net/hippi/Makefile new file mode 100644 index 0000000..b95d629 --- /dev/null +++ b/drivers/net/hippi/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the HIPPI network device drivers. +# + +obj-$(CONFIG_ROADRUNNER) += rrunner.o