diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-13 22:20:35 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 02:42:06 -0700 |
commit | a6a5580c4d90788d67a77c689d3ab22aa5eecfc3 (patch) | |
tree | 89080daf4b0b4939daadb807f19eca3e977d42cb /drivers | |
parent | 9aa3283595451ca093500ff0977b106e1f465586 (diff) |
enic: Move the Cisco driver
Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
necessary Kconfig and Makefile changes.
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/Kconfig | 6 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/Kconfig | 22 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/Makefile | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/Kconfig | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/Makefile (renamed from drivers/net/enic/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/cq_desc.h (renamed from drivers/net/enic/cq_desc.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/cq_enet_desc.h (renamed from drivers/net/enic/cq_enet_desc.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic.h (renamed from drivers/net/enic/enic.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_dev.c (renamed from drivers/net/enic/enic_dev.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_dev.h (renamed from drivers/net/enic/enic_dev.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c (renamed from drivers/net/enic/enic_main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_pp.c (renamed from drivers/net/enic/enic_pp.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_pp.h (renamed from drivers/net/enic/enic_pp.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_res.c (renamed from drivers/net/enic/enic_res.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_res.h (renamed from drivers/net/enic/enic_res.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/rq_enet_desc.h (renamed from drivers/net/enic/rq_enet_desc.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_cq.c (renamed from drivers/net/enic/vnic_cq.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_cq.h (renamed from drivers/net/enic/vnic_cq.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_dev.c (renamed from drivers/net/enic/vnic_dev.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_dev.h (renamed from drivers/net/enic/vnic_dev.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_devcmd.h (renamed from drivers/net/enic/vnic_devcmd.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_enet.h (renamed from drivers/net/enic/vnic_enet.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_intr.c (renamed from drivers/net/enic/vnic_intr.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_intr.h (renamed from drivers/net/enic/vnic_intr.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_nic.h (renamed from drivers/net/enic/vnic_nic.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_resource.h (renamed from drivers/net/enic/vnic_resource.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_rq.c (renamed from drivers/net/enic/vnic_rq.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_rq.h (renamed from drivers/net/enic/vnic_rq.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_rss.h (renamed from drivers/net/enic/vnic_rss.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_stats.h (renamed from drivers/net/enic/vnic_stats.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_vic.c (renamed from drivers/net/enic/vnic_vic.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_vic.h (renamed from drivers/net/enic/vnic_vic.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_wq.c (renamed from drivers/net/enic/vnic_wq.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/vnic_wq.h (renamed from drivers/net/enic/vnic_wq.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cisco/enic/wq_enet_desc.h (renamed from drivers/net/enic/wq_enet_desc.h) | 0 |
38 files changed, 38 insertions, 7 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 116f7442e70c..08ce28041063 100644 --- a/drivers/net/Kconfig +++ b/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/drivers/net/Makefile b/drivers/net/Makefile index 54146ed625b7..cf1d5a27a471 100644 --- a/drivers/net/Makefile +++ b/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/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index f23f1b26b64e..18b634e27508 100644 --- a/drivers/net/ethernet/Kconfig +++ b/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/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 27e4da658136..288179b3d0c6 100644 --- a/drivers/net/ethernet/Makefile +++ b/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/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig new file mode 100644 index 000000000000..bbd534880670 --- /dev/null +++ b/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/drivers/net/ethernet/cisco/Makefile b/drivers/net/ethernet/cisco/Makefile new file mode 100644 index 000000000000..6c7437bc4a92 --- /dev/null +++ b/drivers/net/ethernet/cisco/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Cisco device drivers. +# + +obj-$(CONFIG_ENIC) += enic/ diff --git a/drivers/net/ethernet/cisco/enic/Kconfig b/drivers/net/ethernet/cisco/enic/Kconfig new file mode 100644 index 000000000000..9cc706a6cffd --- /dev/null +++ b/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/drivers/net/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile index 9d4974bba247..9d4974bba247 100644 --- a/drivers/net/enic/Makefile +++ b/drivers/net/ethernet/cisco/enic/Makefile diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h index d6dd1b4edf6e..d6dd1b4edf6e 100644 --- a/drivers/net/enic/cq_desc.h +++ b/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 index c2c0680a1146..c2c0680a1146 100644 --- a/drivers/net/enic/cq_enet_desc.h +++ b/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 index ce76d9a8ca6e..ce76d9a8ca6e 100644 --- a/drivers/net/enic/enic.h +++ b/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 index fd6247b3c0ee..fd6247b3c0ee 100644 --- a/drivers/net/enic/enic_dev.c +++ b/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 index ff8e87fdfc1d..ff8e87fdfc1d 100644 --- a/drivers/net/enic/enic_dev.h +++ b/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 index 67a27cd304dd..67a27cd304dd 100644 --- a/drivers/net/enic/enic_main.c +++ b/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 index ffaa75dd1ded..ffaa75dd1ded 100644 --- a/drivers/net/enic/enic_pp.c +++ b/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 index 699e365a944d..699e365a944d 100644 --- a/drivers/net/enic/enic_pp.h +++ b/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 index 4a35367de790..4a35367de790 100644 --- a/drivers/net/enic/enic_res.c +++ b/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 index 25be2734c3fe..25be2734c3fe 100644 --- a/drivers/net/enic/enic_res.h +++ b/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 index e6dd30988d6f..e6dd30988d6f 100644 --- a/drivers/net/enic/rq_enet_desc.h +++ b/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 index 0daa1c7073cb..0daa1c7073cb 100644 --- a/drivers/net/enic/vnic_cq.c +++ b/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 index 579315cbe803..579315cbe803 100644 --- a/drivers/net/enic/vnic_cq.h +++ b/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 index 8c4c8cf486f6..8c4c8cf486f6 100644 --- a/drivers/net/enic/vnic_dev.c +++ b/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 index 852b698fbe7d..852b698fbe7d 100644 --- a/drivers/net/enic/vnic_dev.h +++ b/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 index 8025e8808d61..8025e8808d61 100644 --- a/drivers/net/enic/vnic_devcmd.h +++ b/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 index 609542848e02..609542848e02 100644 --- a/drivers/net/enic/vnic_enet.h +++ b/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 index 0ca107f7bc8c..0ca107f7bc8c 100644 --- a/drivers/net/enic/vnic_intr.c +++ b/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 index 2b1636392294..2b1636392294 100644 --- a/drivers/net/enic/vnic_intr.h +++ b/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 index 995a50dd4c99..995a50dd4c99 100644 --- a/drivers/net/enic/vnic_nic.h +++ b/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 index e0a73f1ca6f4..e0a73f1ca6f4 100644 --- a/drivers/net/enic/vnic_resource.h +++ b/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 index 34105e0951a5..34105e0951a5 100644 --- a/drivers/net/enic/vnic_rq.c +++ b/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 index 2056586f4d4b..2056586f4d4b 100644 --- a/drivers/net/enic/vnic_rq.h +++ b/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 index fa421baf45b8..fa421baf45b8 100644 --- a/drivers/net/enic/vnic_rss.h +++ b/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 index 77750ec93954..77750ec93954 100644 --- a/drivers/net/enic/vnic_stats.h +++ b/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 index 24ef8cd40545..24ef8cd40545 100644 --- a/drivers/net/enic/vnic_vic.c +++ b/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 index 9ef81f148351..9ef81f148351 100644 --- a/drivers/net/enic/vnic_vic.h +++ b/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 index df61bd932ea6..df61bd932ea6 100644 --- a/drivers/net/enic/vnic_wq.c +++ b/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 index 7dd937ac11c2..7dd937ac11c2 100644 --- a/drivers/net/enic/vnic_wq.h +++ b/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 index c7021e3a631f..c7021e3a631f 100644 --- a/drivers/net/enic/wq_enet_desc.h +++ b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h |