diff options
16 files changed, 36 insertions, 10 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5a4c8758973..7e51969ee05 100644 --- a/MAINTAINERS +++ b/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/drivers/net/Kconfig b/drivers/net/Kconfig index fe227123a5f..db03c21af20 100644 --- a/drivers/net/Kconfig +++ b/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/drivers/net/Makefile b/drivers/net/Makefile index faf306865cb..39b04e071af 100644 --- a/drivers/net/Makefile +++ b/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/drivers/net/benet/Kconfig b/drivers/net/benet/Kconfig deleted file mode 100644 index 1a41a49bb61..00000000000 --- a/drivers/net/benet/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -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/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 0bc6635b071..9c003f363a9 100644 --- a/drivers/net/ethernet/Kconfig +++ b/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/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 50faab53b95..2ac05bacab8 100644 --- a/drivers/net/ethernet/Makefile +++ b/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/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig new file mode 100644 index 00000000000..018ac94fb82 --- /dev/null +++ b/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/drivers/net/ethernet/emulex/Makefile b/drivers/net/ethernet/emulex/Makefile new file mode 100644 index 00000000000..ea8ec574d45 --- /dev/null +++ b/drivers/net/ethernet/emulex/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Emulex device drivers. +# + +obj-$(CONFIG_BE2NET) += benet/ diff --git a/drivers/net/ethernet/emulex/benet/Kconfig b/drivers/net/ethernet/emulex/benet/Kconfig new file mode 100644 index 00000000000..804db04a2bd --- /dev/null +++ b/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/drivers/net/benet/Makefile b/drivers/net/ethernet/emulex/benet/Makefile index a60cd805113..a60cd805113 100644 --- a/drivers/net/benet/Makefile +++ b/drivers/net/ethernet/emulex/benet/Makefile diff --git a/drivers/net/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h index 12b5b5168dc..12b5b5168dc 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/ethernet/emulex/benet/be.h diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 427859532f0..427859532f0 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h index b61eac7ece3..b61eac7ece3 100644 --- a/drivers/net/benet/be_cmds.h +++ b/drivers/net/ethernet/emulex/benet/be_cmds.h diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index f144a6f9986..f144a6f9986 100644 --- a/drivers/net/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c diff --git a/drivers/net/benet/be_hw.h b/drivers/net/ethernet/emulex/benet/be_hw.h index fbc8a915519..fbc8a915519 100644 --- a/drivers/net/benet/be_hw.h +++ b/drivers/net/ethernet/emulex/benet/be_hw.h diff --git a/drivers/net/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 1a3accab3d1..1a3accab3d1 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c |