@@ -1754,7 +1754,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>
@@ -1442,12 +1442,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
@@ -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/
@@ -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"
@@ -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/
new file mode 100644
@@ -0,0 +1,18 @@
+#
+# 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.
+
+source "drivers/net/ethernet/cisco/enic/Kconfig"
new file mode 100644
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cisco device drivers.
+#
+
+obj-$(CONFIG_ENIC) += enic/
new file mode 100644
@@ -0,0 +1,9 @@
+#
+# Cisco device configuration
+#
+
+config ENIC
+ tristate "Cisco VIC Ethernet NIC Support"
+ depends on NET_VENDOR_CISCO && PCI && INET
+ ---help---
+ This enables the support for the Cisco VIC Ethernet card.
Move the Cisco driver into drivers/net/ethernet/cisco/ and make the necessary Kconfig and Makefile changes. CC: Scott Feldman <scofeldm@cisco.com> CC: Christian Benvenuti <benve@cisco.com> CC: Vasanthy Kolluri <vkolluri@cisco.com> CC: Roopa Prabhu <roprabhu@cisco.com> CC: David Wang <dwang2@cisco.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- MAINTAINERS | 2 +- drivers/net/Kconfig | 6 ------ drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/cisco/Kconfig | 18 ++++++++++++++++++ drivers/net/ethernet/cisco/Makefile | 5 +++++ drivers/net/ethernet/cisco/enic/Kconfig | 9 +++++++++ drivers/net/{ => ethernet/cisco}/enic/Makefile | 0 drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0 .../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0 drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0 drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0 .../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0 .../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0 .../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0 drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0 .../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0 39 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 drivers/net/ethernet/cisco/Kconfig create mode 100644 drivers/net/ethernet/cisco/Makefile create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%) rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%) rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%) rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%) diff --git a/drivers/net/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile similarity index 100% rename from drivers/net/enic/Makefile rename to drivers/net/ethernet/cisco/enic/Makefile diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h similarity index 100% rename from drivers/net/enic/cq_desc.h rename to drivers/net/ethernet/cisco/enic/cq_desc.h diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/ethernet/cisco/enic/cq_enet_desc.h similarity index 100% rename from drivers/net/enic/cq_enet_desc.h rename to drivers/net/ethernet/cisco/enic/cq_enet_desc.h diff --git a/drivers/net/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h similarity index 100% rename from drivers/net/enic/enic.h rename to drivers/net/ethernet/cisco/enic/enic.h diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c similarity index 100% rename from drivers/net/enic/enic_dev.c rename to drivers/net/ethernet/cisco/enic/enic_dev.c diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h similarity index 100% rename from drivers/net/enic/enic_dev.h rename to drivers/net/ethernet/cisco/enic/enic_dev.h diff --git a/drivers/net/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c similarity index 100% rename from drivers/net/enic/enic_main.c rename to drivers/net/ethernet/cisco/enic/enic_main.c diff --git a/drivers/net/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c similarity index 100% rename from drivers/net/enic/enic_pp.c rename to drivers/net/ethernet/cisco/enic/enic_pp.c diff --git a/drivers/net/enic/enic_pp.h b/drivers/net/ethernet/cisco/enic/enic_pp.h similarity index 100% rename from drivers/net/enic/enic_pp.h rename to drivers/net/ethernet/cisco/enic/enic_pp.h diff --git a/drivers/net/enic/enic_res.c b/drivers/net/ethernet/cisco/enic/enic_res.c similarity index 100% rename from drivers/net/enic/enic_res.c rename to drivers/net/ethernet/cisco/enic/enic_res.c diff --git a/drivers/net/enic/enic_res.h b/drivers/net/ethernet/cisco/enic/enic_res.h similarity index 100% rename from drivers/net/enic/enic_res.h rename to drivers/net/ethernet/cisco/enic/enic_res.h diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/ethernet/cisco/enic/rq_enet_desc.h similarity index 100% rename from drivers/net/enic/rq_enet_desc.h rename to drivers/net/ethernet/cisco/enic/rq_enet_desc.h diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c similarity index 100% rename from drivers/net/enic/vnic_cq.c rename to drivers/net/ethernet/cisco/enic/vnic_cq.c diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/ethernet/cisco/enic/vnic_cq.h similarity index 100% rename from drivers/net/enic/vnic_cq.h rename to drivers/net/ethernet/cisco/enic/vnic_cq.h diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c similarity index 100% rename from drivers/net/enic/vnic_dev.c rename to drivers/net/ethernet/cisco/enic/vnic_dev.c diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/ethernet/cisco/enic/vnic_dev.h similarity index 100% rename from drivers/net/enic/vnic_dev.h rename to drivers/net/ethernet/cisco/enic/vnic_dev.h diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/ethernet/cisco/enic/vnic_devcmd.h similarity index 100% rename from drivers/net/enic/vnic_devcmd.h rename to drivers/net/ethernet/cisco/enic/vnic_devcmd.h diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/ethernet/cisco/enic/vnic_enet.h similarity index 100% rename from drivers/net/enic/vnic_enet.h rename to drivers/net/ethernet/cisco/enic/vnic_enet.h diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/ethernet/cisco/enic/vnic_intr.c similarity index 100% rename from drivers/net/enic/vnic_intr.c rename to drivers/net/ethernet/cisco/enic/vnic_intr.c diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/ethernet/cisco/enic/vnic_intr.h similarity index 100% rename from drivers/net/enic/vnic_intr.h rename to drivers/net/ethernet/cisco/enic/vnic_intr.h diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/ethernet/cisco/enic/vnic_nic.h similarity index 100% rename from drivers/net/enic/vnic_nic.h rename to drivers/net/ethernet/cisco/enic/vnic_nic.h diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/ethernet/cisco/enic/vnic_resource.h similarity index 100% rename from drivers/net/enic/vnic_resource.h rename to drivers/net/ethernet/cisco/enic/vnic_resource.h diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c similarity index 100% rename from drivers/net/enic/vnic_rq.c rename to drivers/net/ethernet/cisco/enic/vnic_rq.c diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/ethernet/cisco/enic/vnic_rq.h similarity index 100% rename from drivers/net/enic/vnic_rq.h rename to drivers/net/ethernet/cisco/enic/vnic_rq.h diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/ethernet/cisco/enic/vnic_rss.h similarity index 100% rename from drivers/net/enic/vnic_rss.h rename to drivers/net/ethernet/cisco/enic/vnic_rss.h diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/ethernet/cisco/enic/vnic_stats.h similarity index 100% rename from drivers/net/enic/vnic_stats.h rename to drivers/net/ethernet/cisco/enic/vnic_stats.h diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/ethernet/cisco/enic/vnic_vic.c similarity index 100% rename from drivers/net/enic/vnic_vic.c rename to drivers/net/ethernet/cisco/enic/vnic_vic.c diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/ethernet/cisco/enic/vnic_vic.h similarity index 100% rename from drivers/net/enic/vnic_vic.h rename to drivers/net/ethernet/cisco/enic/vnic_vic.h diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c similarity index 100% rename from drivers/net/enic/vnic_wq.c rename to drivers/net/ethernet/cisco/enic/vnic_wq.c diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h similarity index 100% rename from drivers/net/enic/vnic_wq.h rename to drivers/net/ethernet/cisco/enic/vnic_wq.h diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h similarity index 100% rename from drivers/net/enic/wq_enet_desc.h rename to drivers/net/ethernet/cisco/enic/wq_enet_desc.h