Commit 0ec00f03 authored Jan 13, 2010 by Amit Kumar Salecha Committed by David S. Miller Jan 16, 2010

NET: Add Qlogic ethernet driver for CNA devices



o Separate Ethernet driver for Qlogic CNA devices

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent af19b491

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -4452,6 +4452,13 @@ S: Supported
		F: Documentation/networking/LICENSE.qla3xxx
		F: drivers/net/qla3xxx.*

		QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
		M: Amit Kumar Salecha <amit.salecha@qlogic.com>
		M: linux-driver@qlogic.com
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/qlcnic/

		QLOGIC QLGE 10Gb ETHERNET DRIVER
		M: Ron Mercer <ron.mercer@qlogic.com>
		M: linux-driver@qlogic.com

drivers/net/Kconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -2778,6 +2778,13 @@ config BNX2X
		To compile this driver as a module, choose M here: the module
		will be called bnx2x. This is recommended.

		config QLCNIC
		tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support"
		depends on PCI
		help
		This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
		devices.

		config QLGE
		tristate "QLogic QLGE 10Gb Ethernet Driver Support"
		depends on PCI

drivers/net/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ 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