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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 337dffbe9a47e660bf64912805eee556f4af6aef..61367ec865cb5a91dbeea22634ca3deb565307be 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5be6a2376f4ff1b5d0a0b623576d85c81dba37c1..cb0e534418e3033263304d1c4caaf92a3b78d421 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6746e8b8bdfcc7434f5d5a6b41ac3e5ef85aebe3..0b763cbe9b1f23c09a3096df2d395241112abe21 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -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