mlx4: Move the Mellanox driver
Jeff Kirsher [Fri, 13 May 2011 08:32:22 +0000 (01:32 -0700)]
Moves the Mellanox driver into drivers/net/ethernet/mellanox/ and
make the necessary Kconfig and Makefile changes.

CC: Roland Dreier <roland@kernel.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

40 files changed:
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/mellanox/Kconfig [new file with mode: 0644]
drivers/net/ethernet/mellanox/Makefile [new file with mode: 0644]
drivers/net/ethernet/mellanox/mlx4/Kconfig [new file with mode: 0644]
drivers/net/ethernet/mellanox/mlx4/Makefile [moved from drivers/net/mlx4/Makefile with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/alloc.c [moved from drivers/net/mlx4/alloc.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/catas.c [moved from drivers/net/mlx4/catas.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/cmd.c [moved from drivers/net/mlx4/cmd.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/cq.c [moved from drivers/net/mlx4/cq.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_cq.c [moved from drivers/net/mlx4/en_cq.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c [moved from drivers/net/mlx4/en_ethtool.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_main.c [moved from drivers/net/mlx4/en_main.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_netdev.c [moved from drivers/net/mlx4/en_netdev.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_port.c [moved from drivers/net/mlx4/en_port.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_port.h [moved from drivers/net/mlx4/en_port.h with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_resources.c [moved from drivers/net/mlx4/en_resources.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_rx.c [moved from drivers/net/mlx4/en_rx.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_selftest.c [moved from drivers/net/mlx4/en_selftest.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/en_tx.c [moved from drivers/net/mlx4/en_tx.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/eq.c [moved from drivers/net/mlx4/eq.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/fw.c [moved from drivers/net/mlx4/fw.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/fw.h [moved from drivers/net/mlx4/fw.h with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/icm.c [moved from drivers/net/mlx4/icm.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/icm.h [moved from drivers/net/mlx4/icm.h with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/intf.c [moved from drivers/net/mlx4/intf.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/main.c [moved from drivers/net/mlx4/main.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/mcg.c [moved from drivers/net/mlx4/mcg.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/mlx4.h [moved from drivers/net/mlx4/mlx4.h with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h [moved from drivers/net/mlx4/mlx4_en.h with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/mr.c [moved from drivers/net/mlx4/mr.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/pd.c [moved from drivers/net/mlx4/pd.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/port.c [moved from drivers/net/mlx4/port.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/profile.c [moved from drivers/net/mlx4/profile.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/qp.c [moved from drivers/net/mlx4/qp.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/reset.c [moved from drivers/net/mlx4/reset.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/sense.c [moved from drivers/net/mlx4/sense.c with 100% similarity]
drivers/net/ethernet/mellanox/mlx4/srq.c [moved from drivers/net/mlx4/srq.c with 100% similarity]

index 2701ee9..56c033a 100644 (file)
@@ -1554,30 +1554,6 @@ config PASEMI_MAC
          This driver supports the on-chip 1/10Gbit Ethernet controller on
          PA Semi's PWRficient line of chips.
 
-config MLX4_EN
-       tristate "Mellanox Technologies 10Gbit Ethernet support"
-       depends on PCI && INET
-       select MLX4_CORE
-       select INET_LRO
-       help
-         This driver supports Mellanox Technologies ConnectX Ethernet
-         devices.
-
-config MLX4_CORE
-       tristate
-       depends on PCI
-       default n
-
-config MLX4_DEBUG
-       bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
-       depends on MLX4_CORE
-       default y
-       ---help---
-         This option causes debugging code to be compiled into the
-         mlx4_core driver.  The output can be turned on via the
-         debug_level module parameter (which can also be set after
-         the driver is loaded through sysfs).
-
 config TEHUTI
        tristate "Tehuti Networks 10G Ethernet"
        depends on PCI
index c8a176f..73e357e 100644 (file)
@@ -157,7 +157,6 @@ obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
 pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
-obj-$(CONFIG_MLX4_CORE) += mlx4/
 obj-$(CONFIG_ENC28J60) += enc28j60.o
 obj-$(CONFIG_ETHOC) += ethoc.o
 obj-$(CONFIG_GRETH) += greth.o
index 225918d..8bbddc9 100644 (file)
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
 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/qlogic/Kconfig"
 source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/sfc/Kconfig"
index 734f7c9..e5f2954 100644 (file)
@@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 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_QLOGIC) += qlogic/
 obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/mellanox/Kconfig b/drivers/net/ethernet/mellanox/Kconfig
new file mode 100644 (file)
index 0000000..e069491
--- /dev/null
@@ -0,0 +1,22 @@
+#
+# Mellanox driver configuration
+#
+
+config NET_VENDOR_MELLANOX
+       bool "Mellanox 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 Mellanox cards. If you say Y, you will be asked
+         for your specific card in the following questions.
+
+if NET_VENDOR_MELLANOX
+
+source "drivers/net/ethernet/mellanox/mlx4/Kconfig"
+
+endif # NET_VENDOR_MELLANOX
diff --git a/drivers/net/ethernet/mellanox/Makefile b/drivers/net/ethernet/mellanox/Makefile
new file mode 100644 (file)
index 0000000..37afb96
--- /dev/null
@@ -0,0 +1,5 @@
+#
+# Makefile for the Mellanox device drivers.
+#
+
+obj-$(CONFIG_MLX4_CORE) += mlx4/
diff --git a/drivers/net/ethernet/mellanox/mlx4/Kconfig b/drivers/net/ethernet/mellanox/mlx4/Kconfig
new file mode 100644 (file)
index 0000000..1bb9353
--- /dev/null
@@ -0,0 +1,27 @@
+#
+# Mellanox driver configuration
+#
+
+config MLX4_EN
+       tristate "Mellanox Technologies 10Gbit Ethernet support"
+       depends on PCI && INET
+       select MLX4_CORE
+       select INET_LRO
+       ---help---
+         This driver supports Mellanox Technologies ConnectX Ethernet
+         devices.
+
+config MLX4_CORE
+       tristate
+       depends on PCI
+       default n
+
+config MLX4_DEBUG
+       bool "Verbose debugging output" if (MLX4_CORE && EXPERT)
+       depends on MLX4_CORE
+       default y
+       ---help---
+         This option causes debugging code to be compiled into the
+         mlx4_core driver.  The output can be turned on via the
+         debug_level module parameter (which can also be set after
+         the driver is loaded through sysfs).