myri*: Move the Myricom drivers

Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
the necessary Kconfig and Makefile changes.

CC: Andrew Gallatin <gallatin@myri.com>
CC: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0613e60..0a5ae23 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4335,7 +4335,7 @@ M:        Andrew Gallatin <gallatin@myri.com>
 L:     netdev@vger.kernel.org
 W:     http://www.myri.com/scs/download-Myri10GE.html
 S:     Supported
-F:     drivers/net/myri10ge/
+F:     drivers/net/ethernet/myricom/myri10ge/
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 M:     Tim Hockin <thockin@hockin.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 56c033a..38fcaea 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1519,32 +1519,6 @@ config VXGE_DEBUG_TRACE_ALL
          the vxge driver. By default only few debug trace statements are
          enabled.
 
-config MYRI10GE
-       tristate "Myricom Myri-10G Ethernet support"
-       depends on PCI && INET
-       select FW_LOADER
-       select CRC32
-       select INET_LRO
-       ---help---
-         This driver supports Myricom Myri-10G Dual Protocol interface in
-         Ethernet mode. If the eeprom on your board is not recent enough,
-         you will need a newer firmware image.
-         You may get this image or more information, at:
-
-         <http://www.myri.com/scs/download-Myri10GE.html>
-
-         To compile this driver as a module, choose M here. The module
-         will be called myri10ge.
-
-config MYRI10GE_DCA
-       bool "Direct Cache Access (DCA) Support"
-       default y
-       depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
-       ---help---
-         Say Y here if you want to use Direct Cache Access (DCA) in the
-         driver.  DCA is a method for warming the CPU cache before data
-         is used, with the intent of lessening the impact of cache misses.
-
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
        depends on PPC_PASEMI && PCI && INET

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 73e357e..b9e1f5a 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -151,7 +151,6 @@ obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
 obj-$(CONFIG_S2IO) += s2io.o
 obj-$(CONFIG_VXGE) += vxge/
-obj-$(CONFIG_MYRI10GE) += myri10ge/
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8bbddc9..ce3040d 100644 (file)
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -21,6 +21,7 @@ source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"
+source "drivers/net/ethernet/myricom/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"

diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e5f2954..b4dcb93 100644 (file)
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
+obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/

diff --git a/drivers/net/ethernet/myricom/Kconfig b/drivers/net/ethernet/myricom/Kconfig
new file mode 100644 (file)
index 0000000..1816ae1
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Kconfig
@@ -0,0 +1,46 @@
+#
+# Myricom device configuration
+#
+
+config NET_VENDOR_MYRI
+       bool "Myricom devices"
+       depends on PCI && INET
+       ---help---
+         If you have a network (Ethernet) card belonging to this class, say
+         Y and read the Ethernet-HOWTO, available from
+         <http://www.tldp.org/docs.html#howto>.
+
+         Note that the answer to this question doesn't directly affect the
+         kernel: saying N will just cause the configurator to skip all
+         the questions about Myricom cards. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_MYRI
+
+config MYRI10GE
+       tristate "Myricom Myri-10G Ethernet support"
+       depends on PCI && INET
+       select FW_LOADER
+       select CRC32
+       select INET_LRO
+       ---help---
+         This driver supports Myricom Myri-10G Dual Protocol interface in
+         Ethernet mode. If the eeprom on your board is not recent enough,
+         you will need a newer firmware image.
+         You may get this image or more information, at:
+
+         <http://www.myri.com/scs/download-Myri10GE.html>
+
+         To compile this driver as a module, choose M here. The module
+         will be called myri10ge.
+
+config MYRI10GE_DCA
+       bool "Direct Cache Access (DCA) Support"
+       default y
+       depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
+       ---help---
+         Say Y here if you want to use Direct Cache Access (DCA) in the
+         driver.  DCA is a method for warming the CPU cache before data
+         is used, with the intent of lessening the impact of cache misses.
+
+endif # NET_VENDOR_MYRI

diff --git a/drivers/net/ethernet/myricom/Makefile b/drivers/net/ethernet/myricom/Makefile
new file mode 100644 (file)
index 0000000..296c0a1
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Myricom network device drivers.
+#
+
+obj-$(CONFIG_MYRI10GE) += myri10ge/

diff --git a/drivers/net/myri10ge/Makefile b/drivers/net/ethernet/myricom/myri10ge/Makefile
similarity index 100%
rename from drivers/net/myri10ge/Makefile
rename to drivers/net/ethernet/myricom/myri10ge/Makefile

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
similarity index 100%
rename from drivers/net/myri10ge/myri10ge.c
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge.c

diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h

diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp_gen_header.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h