---

yaml --- r: 265218 b: refs/heads/master c: a6a5580 h: refs/heads/master v: v3
git-mirror · Aug 11, 2011 · 65a8c92 · 65a8c92
1 parent a05db90
commit 65a8c92
Show file tree

Hide file tree

Showing 40 changed files with 40 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aa3283595451ca093500ff0977b106e1f465586
+refs/heads/master: a6a5580c4d90788d67a77c689d3ab22aa5eecfc3
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -1761,7 +1761,7 @@ M:	Vasanthy Kolluri <vkolluri@cisco.com>
 M:	Roopa Prabhu <roprabhu@cisco.com>
 M:	David Wang <dwang2@cisco.com>
 S:	Supported
-F:	drivers/net/enic/
+F:	drivers/net/ethernet/cisco/enic/
 
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:	Hartley Sweeten <hsweeten@visionengravers.com>

diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1457,12 +1457,6 @@ if NETDEV_10000
 config MDIO
 	tristate
 
-config ENIC
-	tristate "Cisco VIC Ethernet NIC Support"
-	depends on PCI && INET
-	help
-	  This enables the support for the Cisco VIC Ethernet card.
-
 config PASEMI_MAC
 	tristate "PA Semi 1/10Gbit MAC"
 	depends on PPC_PASEMI && PCI && INET

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_ATL1C) += atl1c/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 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_VMXNET3) += vmxnet3/
 

diff --git a/trunk/drivers/net/ethernet/Kconfig b/trunk/drivers/net/ethernet/Kconfig
@@ -17,6 +17,7 @@ source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
+source "drivers/net/ethernet/cisco/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
 source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/ibm/Kconfig"

diff --git a/trunk/drivers/net/ethernet/Makefile b/trunk/drivers/net/ethernet/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
+obj-$(CONFIG_NET_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
 obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_IBM) += ibm/

diff --git a/trunk/drivers/net/ethernet/cisco/Kconfig b/trunk/drivers/net/ethernet/cisco/Kconfig
@@ -0,0 +1,22 @@
+#
+# Cisco device configuration
+#
+
+config NET_VENDOR_CISCO
+	bool "Cisco 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 Cisco cards. If you say Y, you will be asked for
+	  your specific card in the following questions.
+
+if NET_VENDOR_CISCO
+
+source "drivers/net/ethernet/cisco/enic/Kconfig"
+
+endif # NET_VENDOR_CISCO
diff --git a/trunk/drivers/net/ethernet/cisco/Makefile b/trunk/drivers/net/ethernet/cisco/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cisco device drivers.
+#
+
+obj-$(CONFIG_ENIC) += enic/
diff --git a/trunk/drivers/net/ethernet/cisco/enic/Kconfig b/trunk/drivers/net/ethernet/cisco/enic/Kconfig
@@ -0,0 +1,9 @@
+#
+# Cisco device configuration
+#
+
+config ENIC
+	tristate "Cisco VIC Ethernet NIC Support"
+	depends on PCI && INET
+	---help---
+	  This enables the support for the Cisco VIC Ethernet card.
diff --git a/trunk/drivers/net/enic/Makefile → .../drivers/net/ethernet/cisco/enic/Makefile b/trunk/drivers/net/enic/Makefile → .../drivers/net/ethernet/cisco/enic/Makefile
diff --git a/trunk/drivers/net/enic/cq_desc.h → ...drivers/net/ethernet/cisco/enic/cq_desc.h b/trunk/drivers/net/enic/cq_desc.h → ...drivers/net/ethernet/cisco/enic/cq_desc.h
diff --git a/trunk/drivers/net/enic/cq_enet_desc.h → ...rs/net/ethernet/cisco/enic/cq_enet_desc.h b/trunk/drivers/net/enic/cq_enet_desc.h → ...rs/net/ethernet/cisco/enic/cq_enet_desc.h
diff --git a/trunk/drivers/net/enic/enic.h → trunk/drivers/net/ethernet/cisco/enic/enic.h b/trunk/drivers/net/enic/enic.h → trunk/drivers/net/ethernet/cisco/enic/enic.h
diff --git a/trunk/drivers/net/enic/enic_dev.c → ...rivers/net/ethernet/cisco/enic/enic_dev.c b/trunk/drivers/net/enic/enic_dev.c → ...rivers/net/ethernet/cisco/enic/enic_dev.c
diff --git a/trunk/drivers/net/enic/enic_dev.h → ...rivers/net/ethernet/cisco/enic/enic_dev.h b/trunk/drivers/net/enic/enic_dev.h → ...rivers/net/ethernet/cisco/enic/enic_dev.h
diff --git a/trunk/drivers/net/enic/enic_main.c → ...ivers/net/ethernet/cisco/enic/enic_main.c b/trunk/drivers/net/enic/enic_main.c → ...ivers/net/ethernet/cisco/enic/enic_main.c
diff --git a/trunk/drivers/net/enic/enic_pp.c → ...drivers/net/ethernet/cisco/enic/enic_pp.c b/trunk/drivers/net/enic/enic_pp.c → ...drivers/net/ethernet/cisco/enic/enic_pp.c
diff --git a/trunk/drivers/net/enic/enic_pp.h → ...drivers/net/ethernet/cisco/enic/enic_pp.h b/trunk/drivers/net/enic/enic_pp.h → ...drivers/net/ethernet/cisco/enic/enic_pp.h
diff --git a/trunk/drivers/net/enic/enic_res.c → ...rivers/net/ethernet/cisco/enic/enic_res.c b/trunk/drivers/net/enic/enic_res.c → ...rivers/net/ethernet/cisco/enic/enic_res.c
diff --git a/trunk/drivers/net/enic/enic_res.h → ...rivers/net/ethernet/cisco/enic/enic_res.h b/trunk/drivers/net/enic/enic_res.h → ...rivers/net/ethernet/cisco/enic/enic_res.h
diff --git a/trunk/drivers/net/enic/rq_enet_desc.h → ...rs/net/ethernet/cisco/enic/rq_enet_desc.h b/trunk/drivers/net/enic/rq_enet_desc.h → ...rs/net/ethernet/cisco/enic/rq_enet_desc.h
diff --git a/trunk/drivers/net/enic/vnic_cq.c → ...drivers/net/ethernet/cisco/enic/vnic_cq.c b/trunk/drivers/net/enic/vnic_cq.c → ...drivers/net/ethernet/cisco/enic/vnic_cq.c
diff --git a/trunk/drivers/net/enic/vnic_cq.h → ...drivers/net/ethernet/cisco/enic/vnic_cq.h b/trunk/drivers/net/enic/vnic_cq.h → ...drivers/net/ethernet/cisco/enic/vnic_cq.h
diff --git a/trunk/drivers/net/enic/vnic_dev.c → ...rivers/net/ethernet/cisco/enic/vnic_dev.c b/trunk/drivers/net/enic/vnic_dev.c → ...rivers/net/ethernet/cisco/enic/vnic_dev.c
diff --git a/trunk/drivers/net/enic/vnic_dev.h → ...rivers/net/ethernet/cisco/enic/vnic_dev.h b/trunk/drivers/net/enic/vnic_dev.h → ...rivers/net/ethernet/cisco/enic/vnic_dev.h
diff --git a/trunk/drivers/net/enic/vnic_devcmd.h → ...ers/net/ethernet/cisco/enic/vnic_devcmd.h b/trunk/drivers/net/enic/vnic_devcmd.h → ...ers/net/ethernet/cisco/enic/vnic_devcmd.h
diff --git a/trunk/drivers/net/enic/vnic_enet.h → ...ivers/net/ethernet/cisco/enic/vnic_enet.h b/trunk/drivers/net/enic/vnic_enet.h → ...ivers/net/ethernet/cisco/enic/vnic_enet.h
diff --git a/trunk/drivers/net/enic/vnic_intr.c → ...ivers/net/ethernet/cisco/enic/vnic_intr.c b/trunk/drivers/net/enic/vnic_intr.c → ...ivers/net/ethernet/cisco/enic/vnic_intr.c
diff --git a/trunk/drivers/net/enic/vnic_intr.h → ...ivers/net/ethernet/cisco/enic/vnic_intr.h b/trunk/drivers/net/enic/vnic_intr.h → ...ivers/net/ethernet/cisco/enic/vnic_intr.h
diff --git a/trunk/drivers/net/enic/vnic_nic.h → ...rivers/net/ethernet/cisco/enic/vnic_nic.h b/trunk/drivers/net/enic/vnic_nic.h → ...rivers/net/ethernet/cisco/enic/vnic_nic.h
diff --git a/trunk/drivers/net/enic/vnic_resource.h → ...s/net/ethernet/cisco/enic/vnic_resource.h b/trunk/drivers/net/enic/vnic_resource.h → ...s/net/ethernet/cisco/enic/vnic_resource.h
diff --git a/trunk/drivers/net/enic/vnic_rq.c → ...drivers/net/ethernet/cisco/enic/vnic_rq.c b/trunk/drivers/net/enic/vnic_rq.c → ...drivers/net/ethernet/cisco/enic/vnic_rq.c
diff --git a/trunk/drivers/net/enic/vnic_rq.h → ...drivers/net/ethernet/cisco/enic/vnic_rq.h b/trunk/drivers/net/enic/vnic_rq.h → ...drivers/net/ethernet/cisco/enic/vnic_rq.h
diff --git a/trunk/drivers/net/enic/vnic_rss.h → ...rivers/net/ethernet/cisco/enic/vnic_rss.h b/trunk/drivers/net/enic/vnic_rss.h → ...rivers/net/ethernet/cisco/enic/vnic_rss.h
diff --git a/trunk/drivers/net/enic/vnic_stats.h → ...vers/net/ethernet/cisco/enic/vnic_stats.h b/trunk/drivers/net/enic/vnic_stats.h → ...vers/net/ethernet/cisco/enic/vnic_stats.h
diff --git a/trunk/drivers/net/enic/vnic_vic.c → ...rivers/net/ethernet/cisco/enic/vnic_vic.c b/trunk/drivers/net/enic/vnic_vic.c → ...rivers/net/ethernet/cisco/enic/vnic_vic.c
diff --git a/trunk/drivers/net/enic/vnic_vic.h → ...rivers/net/ethernet/cisco/enic/vnic_vic.h b/trunk/drivers/net/enic/vnic_vic.h → ...rivers/net/ethernet/cisco/enic/vnic_vic.h
diff --git a/trunk/drivers/net/enic/vnic_wq.c → ...drivers/net/ethernet/cisco/enic/vnic_wq.c b/trunk/drivers/net/enic/vnic_wq.c → ...drivers/net/ethernet/cisco/enic/vnic_wq.c
diff --git a/trunk/drivers/net/enic/vnic_wq.h → ...drivers/net/ethernet/cisco/enic/vnic_wq.h b/trunk/drivers/net/enic/vnic_wq.h → ...drivers/net/ethernet/cisco/enic/vnic_wq.h
diff --git a/trunk/drivers/net/enic/wq_enet_desc.h → ...rs/net/ethernet/cisco/enic/wq_enet_desc.h b/trunk/drivers/net/enic/wq_enet_desc.h → ...rs/net/ethernet/cisco/enic/wq_enet_desc.h