diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -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 |
39 files changed, 39 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2fcfa8b02d9..c54e736f589 100644 --- a/MAINTAINERS +++ b/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/drivers/net/Kconfig b/drivers/net/Kconfig index 116f7442e70..08ce2804106 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 54146ed625b..cf1d5a27a47 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 f23f1b26b64..18b634e2750 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 27e4da65813..288179b3d0c 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 00000000000..bbd53488067 --- /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 00000000000..6c7437bc4a9 --- /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 00000000000..9cc706a6cff --- /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 9d4974bba24..9d4974bba24 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 d6dd1b4edf6..d6dd1b4edf6 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 c2c0680a114..c2c0680a114 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 ce76d9a8ca6..ce76d9a8ca6 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 fd6247b3c0e..fd6247b3c0e 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 ff8e87fdfc1..ff8e87fdfc1 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 67a27cd304d..67a27cd304d 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 ffaa75dd1de..ffaa75dd1de 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 699e365a944..699e365a944 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 4a35367de79..4a35367de79 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 25be2734c3f..25be2734c3f 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 e6dd30988d6..e6dd30988d6 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 0daa1c7073c..0daa1c7073c 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 579315cbe80..579315cbe80 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 8c4c8cf486f..8c4c8cf486f 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 852b698fbe7..852b698fbe7 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 8025e8808d6..8025e8808d6 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 609542848e0..609542848e0 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 0ca107f7bc8..0ca107f7bc8 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 2b163639229..2b163639229 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 995a50dd4c9..995a50dd4c9 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 e0a73f1ca6f..e0a73f1ca6f 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 34105e0951a..34105e0951a 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 2056586f4d4..2056586f4d4 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 fa421baf45b..fa421baf45b 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 77750ec9395..77750ec9395 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 24ef8cd4054..24ef8cd4054 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 9ef81f14835..9ef81f14835 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 df61bd932ea..df61bd932ea 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 7dd937ac11c..7dd937ac11c 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 c7021e3a631..c7021e3a631 100644 --- a/drivers/net/enic/wq_enet_desc.h +++ b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h |