Commit aa43c215 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

qlogic: Move the QLogic drivers 



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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarAnirban Chakraborty <anirban.chakraborty@qlogic.com>
parent dee1ad47

MAINTAINERS

+4 −4
Original line number Original line Diff line number Diff line
@@ -4499,7 +4499,7 @@ M: Amit Kumar Salecha <amit.salecha@qlogic.com> 
L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

W:	http://www.qlogic.com

W:	http://www.qlogic.com

S:	Supported

S:	Supported

F:	drivers/net/netxen/

F:	drivers/net/ethernet/qlogic/netxen/





NFS, SUNRPC, AND LOCKD CLIENTS

NFS, SUNRPC, AND LOCKD CLIENTS

M:	Trond Myklebust <Trond.Myklebust@netapp.com>

M:	Trond Myklebust <Trond.Myklebust@netapp.com>
@@ -5245,7 +5245,7 @@ M: linux-driver@qlogic.com 
L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	Documentation/networking/LICENSE.qla3xxx

F:	Documentation/networking/LICENSE.qla3xxx

F:	drivers/net/qla3xxx.*

F:	drivers/net/ethernet/qlogic/qla3xxx.*





QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER

QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER

M:	Amit Kumar Salecha <amit.salecha@qlogic.com>

M:	Amit Kumar Salecha <amit.salecha@qlogic.com>
@@ -5253,7 +5253,7 @@ M: Anirban Chakraborty <anirban.chakraborty@qlogic.com> 
M:	linux-driver@qlogic.com

M:	linux-driver@qlogic.com

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/qlcnic/

F:	drivers/net/ethernet/qlogic/qlcnic/





QLOGIC QLGE 10Gb ETHERNET DRIVER

QLOGIC QLGE 10Gb ETHERNET DRIVER

M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>

M:	Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
@@ -5261,7 +5261,7 @@ M: Ron Mercer <ron.mercer@qlogic.com> 
M:	linux-driver@qlogic.com

M:	linux-driver@qlogic.com

L:	netdev@vger.kernel.org

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/qlge/

F:	drivers/net/ethernet/qlogic/qlge/





QNX4 FILESYSTEM

QNX4 FILESYSTEM

M:	Anders Larsen <al@alarsen.net>

M:	Anders Larsen <al@alarsen.net>

drivers/net/Kconfig

+0 −26
Original line number Original line Diff line number Diff line
@@ -1707,15 +1707,6 @@ config XILINX_LL_TEMAC 
	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC

	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC

	  core used in Xilinx Spartan and Virtex FPGAs

	  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

config ATL1

	tristate "Atheros/Attansic L1 Gigabit Ethernet support"

	tristate "Atheros/Attansic L1 Gigabit Ethernet support"

	depends on PCI

	depends on PCI
@@ -1954,23 +1945,6 @@ config TEHUTI 
	help

	help

	  Tehuti Networks 10G Ethernet NIC

	  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

config BNA

	tristate "Brocade 1010/1020 10Gb Ethernet Driver support"

	tristate "Brocade 1010/1020 10Gb Ethernet Driver support"

	depends on PCI

	depends on PCI

drivers/net/Makefile

+0 −3
Original line number Original line Diff line number Diff line
@@ -110,9 +110,6 @@ obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o 
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o

ll_temac-objs := ll_temac_main.o ll_temac_mdio.o

obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o

obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o

obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.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) += ppp_generic.o

obj-$(CONFIG_PPP_ASYNC) += ppp_async.o

obj-$(CONFIG_PPP_ASYNC) += ppp_async.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -17,5 +17,6 @@ source "drivers/net/ethernet/amd/Kconfig" 
source "drivers/net/ethernet/broadcom/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"

source "drivers/net/ethernet/chelsio/Kconfig"

source "drivers/net/ethernet/chelsio/Kconfig"

source "drivers/net/ethernet/intel/Kconfig"

source "drivers/net/ethernet/intel/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"





endif # ETHERNET
 
endif # ETHERNET

drivers/net/ethernet/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,3 +8,4 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ 
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

CRA Git | Maintained and supported by SUSTech CRA and CCSE