qlogic: Move the QLogic drivers
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 9 Apr 2011 02:06:30 +0000 (19:06 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 11 Aug 2011 03:03:49 +0000 (20:03 -0700)
Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
the necessary Kconfig and Makefile changes.

CC: Ron Mercer <ron.mercer@qlogic.com>
CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
32 files changed:
MAINTAINERS
drivers/net/Kconfig
drivers/net/Makefile
drivers/net/ethernet/Kconfig
drivers/net/ethernet/Makefile
drivers/net/ethernet/qlogic/Kconfig [new file with mode: 0644]
drivers/net/ethernet/qlogic/Makefile [new file with mode: 0644]
drivers/net/ethernet/qlogic/netxen/Makefile [moved from drivers/net/netxen/Makefile with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic.h [moved from drivers/net/netxen/netxen_nic.h with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c [moved from drivers/net/netxen/netxen_nic_ctx.c with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c [moved from drivers/net/netxen/netxen_nic_ethtool.c with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h [moved from drivers/net/netxen/netxen_nic_hdr.h with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c [moved from drivers/net/netxen/netxen_nic_hw.c with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.h [moved from drivers/net/netxen/netxen_nic_hw.h with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c [moved from drivers/net/netxen/netxen_nic_init.c with 100% similarity]
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c [moved from drivers/net/netxen/netxen_nic_main.c with 100% similarity]
drivers/net/ethernet/qlogic/qla3xxx.c [moved from drivers/net/qla3xxx.c with 100% similarity]
drivers/net/ethernet/qlogic/qla3xxx.h [moved from drivers/net/qla3xxx.h with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/Makefile [moved from drivers/net/qlcnic/Makefile with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h [moved from drivers/net/qlcnic/qlcnic.h with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c [moved from drivers/net/qlcnic/qlcnic_ctx.c with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c [moved from drivers/net/qlcnic/qlcnic_ethtool.c with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hdr.h [moved from drivers/net/qlcnic/qlcnic_hdr.h with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c [moved from drivers/net/qlcnic/qlcnic_hw.c with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c [moved from drivers/net/qlcnic/qlcnic_init.c with 100% similarity]
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c [moved from drivers/net/qlcnic/qlcnic_main.c with 100% similarity]
drivers/net/ethernet/qlogic/qlge/Makefile [moved from drivers/net/qlge/Makefile with 100% similarity]
drivers/net/ethernet/qlogic/qlge/qlge.h [moved from drivers/net/qlge/qlge.h with 100% similarity]
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c [moved from drivers/net/qlge/qlge_dbg.c with 100% similarity]
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c [moved from drivers/net/qlge/qlge_ethtool.c with 100% similarity]
drivers/net/ethernet/qlogic/qlge/qlge_main.c [moved from drivers/net/qlge/qlge_main.c with 100% similarity]
drivers/net/ethernet/qlogic/qlge/qlge_mpi.c [moved from drivers/net/qlge/qlge_mpi.c with 100% similarity]

index f4838da..8f2821c 100644 (file)
@@ -4499,7 +4499,7 @@ M:        Amit Kumar Salecha <amit.salecha@qlogic.com>
 L:     netdev@vger.kernel.org
 W:     http://www.qlogic.com
 S:     Supported
-F:     drivers/net/netxen/
+F:     drivers/net/ethernet/qlogic/netxen/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <Trond.Myklebust@netapp.com>
@@ -5245,7 +5245,7 @@ M:        linux-driver@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     Documentation/networking/LICENSE.qla3xxx
-F:     drivers/net/qla3xxx.*
+F:     drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 M:     Amit Kumar Salecha <amit.salecha@qlogic.com>
@@ -5253,7 +5253,7 @@ M:        Anirban Chakraborty <anirban.chakraborty@qlogic.com>
 M:     linux-driver@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     drivers/net/qlcnic/
+F:     drivers/net/ethernet/qlogic/qlcnic/
 
 QLOGIC QLGE 10Gb ETHERNET DRIVER
 M:     Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
@@ -5261,7 +5261,7 @@ M:        Ron Mercer <ron.mercer@qlogic.com>
 M:     linux-driver@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
-F:     drivers/net/qlge/
+F:     drivers/net/ethernet/qlogic/qlge/
 
 QNX4 FILESYSTEM
 M:     Anders Larsen <al@alarsen.net>
index e649116..de2293d 100644 (file)
@@ -1707,15 +1707,6 @@ config XILINX_LL_TEMAC
          This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
          core used in Xilinx Spartan and Virtex FPGAs
 
-config QLA3XXX
-       tristate "QLogic QLA3XXX Network Driver Support"
-       depends on PCI
-       help
-         This driver supports QLogic ISP3XXX gigabit Ethernet cards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called qla3xxx.
-
 config ATL1
        tristate "Atheros/Attansic L1 Gigabit Ethernet support"
        depends on PCI
@@ -1954,23 +1945,6 @@ config TEHUTI
        help
          Tehuti Networks 10G Ethernet NIC
 
-config QLCNIC
-       tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
-       depends on PCI
-       select FW_LOADER
-       help
-         This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
-         devices.
-
-config QLGE
-       tristate "QLogic QLGE 10Gb Ethernet Driver Support"
-       depends on PCI
-       help
-         This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
-
-         To compile this driver as a module, choose M here: the module
-         will be called qlge.
-
 config BNA
        tristate "Brocade 1010/1020 10Gb Ethernet Driver support"
        depends on PCI
index 84b9860..a58a9f0 100644 (file)
@@ -110,9 +110,6 @@ obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o
 ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
 obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
 obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
-obj-$(CONFIG_QLA3XXX) += qla3xxx.o
-obj-$(CONFIG_QLCNIC) += qlcnic/
-obj-$(CONFIG_QLGE) += qlge/
 
 obj-$(CONFIG_PPP) += ppp_generic.o
 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
index a2fd385..ab591bb 100644 (file)
@@ -17,5 +17,6 @@ source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/qlogic/Kconfig"
 
 endif # ETHERNET
index 5265271..d8cf120 100644 (file)
@@ -8,3 +8,4 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
new file mode 100644 (file)
index 0000000..a7c4424
--- /dev/null
@@ -0,0 +1,53 @@
+#
+# QLogic network device configuration
+#
+
+config NET_VENDOR_QLOGIC
+       bool "QLogic devices"
+       depends on PCI
+       ---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 QLogic cards. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_QLOGIC
+
+config QLA3XXX
+       tristate "QLogic QLA3XXX Network Driver Support"
+       depends on PCI
+       ---help---
+         This driver supports QLogic ISP3XXX gigabit Ethernet cards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called qla3xxx.
+
+config QLCNIC
+       tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
+       depends on PCI
+       select FW_LOADER
+       ---help---
+         This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
+         devices.
+
+config QLGE
+       tristate "QLogic QLGE 10Gb Ethernet Driver Support"
+       depends on PCI
+       ---help---
+         This driver supports QLogic ISP8XXX 10Gb Ethernet cards.
+
+         To compile this driver as a module, choose M here: the module
+         will be called qlge.
+
+config NETXEN_NIC
+       tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+       depends on PCI
+       select FW_LOADER
+       ---help---
+         This enables the support for NetXen's Gigabit Ethernet card.
+
+endif # NET_VENDOR_QLOGIC
diff --git a/drivers/net/ethernet/qlogic/Makefile b/drivers/net/ethernet/qlogic/Makefile
new file mode 100644 (file)
index 0000000..b2a283d
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# Makefile for the QLogic network device drivers.
+#
+
+obj-$(CONFIG_QLA3XXX) += qla3xxx.o
+obj-$(CONFIG_QLCNIC) += qlcnic/
+obj-$(CONFIG_QLGE) += qlge/
+obj-$(CONFIG_NETXEN_NIC) += netxen/