---

yaml --- r: 265212 b: refs/heads/master c: 9aebddd h: refs/heads/master v: v3
git-mirror · Aug 11, 2011 · a082f1f · a082f1f
1 parent 038b332
commit a082f1f
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 874aeea5d01cac55c160a4e503e3ddb4db030de7
+refs/heads/master: 9aebddd11be42366f89b0296590770c02797aa98
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -5746,7 +5746,7 @@ M:	Ajit Khaparde <ajit.khaparde@emulex.com>
 L:	netdev@vger.kernel.org
 W:	http://www.emulex.com
 S:	Supported
-F:	drivers/net/benet/
+F:	drivers/net/ethernet/emulex/benet/
 
 SFC NETWORK DRIVER
 M:	Solarflare linux maintainers <linux-net-drivers@solarflare.com>

diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1598,8 +1598,6 @@ config BNA
 
 	  <http://support.brocade.com>
 
-source "drivers/net/benet/Kconfig"
-
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
 obj-$(CONFIG_TEHUTI) += tehuti.o
 obj-$(CONFIG_ENIC) += enic/
 obj-$(CONFIG_JME) += jme.o
-obj-$(CONFIG_BE2NET) += benet/
 obj-$(CONFIG_VMXNET3) += vmxnet3/
 obj-$(CONFIG_BNA) += bna/
 

diff --git a/trunk/drivers/net/benet/Kconfig b/trunk/drivers/net/benet/Kconfig
diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
@@ -16,6 +16,7 @@ source "drivers/net/ethernet/8390/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 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/qlogic/Kconfig"

diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 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_QLOGIC) += qlogic/

diff --git a/trunk/drivers/net/ethernet/emulex/Kconfig b/trunk/drivers/net/ethernet/emulex/Kconfig
@@ -0,0 +1,22 @@
+#
+# Emulex driver configuration
+#
+
+config NET_VENDOR_EMULEX
+	bool "Emulex 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 Emulex cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if NET_VENDOR_EMULEX
+
+source "drivers/net/ethernet/emulex/benet/Kconfig"
+
+endif # NET_VENDOR_EMULEX
diff --git a/trunk/drivers/net/ethernet/emulex/Makefile b/trunk/drivers/net/ethernet/emulex/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Emulex device drivers.
+#
+
+obj-$(CONFIG_BE2NET) += benet/
diff --git a/trunk/drivers/net/ethernet/emulex/benet/Kconfig b/trunk/drivers/net/ethernet/emulex/benet/Kconfig
@@ -0,0 +1,6 @@
+config BE2NET
+	tristate "ServerEngines' 10Gbps NIC - BladeEngine"
+	depends on PCI && INET
+	---help---
+	  This driver implements the NIC functionality for ServerEngines'
+	  10Gbps network adapter - BladeEngine.
diff --git a/trunk/drivers/net/benet/Makefile → ...rivers/net/ethernet/emulex/benet/Makefile b/trunk/drivers/net/benet/Makefile → ...rivers/net/ethernet/emulex/benet/Makefile
diff --git a/trunk/drivers/net/benet/be.h → trunk/drivers/net/ethernet/emulex/benet/be.h b/trunk/drivers/net/benet/be.h → trunk/drivers/net/ethernet/emulex/benet/be.h
diff --git a/trunk/drivers/net/benet/be_cmds.c → ...ivers/net/ethernet/emulex/benet/be_cmds.c b/trunk/drivers/net/benet/be_cmds.c → ...ivers/net/ethernet/emulex/benet/be_cmds.c
diff --git a/trunk/drivers/net/benet/be_cmds.h → ...ivers/net/ethernet/emulex/benet/be_cmds.h b/trunk/drivers/net/benet/be_cmds.h → ...ivers/net/ethernet/emulex/benet/be_cmds.h
diff --git a/trunk/drivers/net/benet/be_ethtool.c → ...rs/net/ethernet/emulex/benet/be_ethtool.c b/trunk/drivers/net/benet/be_ethtool.c → ...rs/net/ethernet/emulex/benet/be_ethtool.c
diff --git a/trunk/drivers/net/benet/be_hw.h → ...drivers/net/ethernet/emulex/benet/be_hw.h b/trunk/drivers/net/benet/be_hw.h → ...drivers/net/ethernet/emulex/benet/be_hw.h
diff --git a/trunk/drivers/net/benet/be_main.c → ...ivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/benet/be_main.c → ...ivers/net/ethernet/emulex/benet/be_main.c