From 9aebddd11be42366f89b0296590770c02797aa98 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 00:37:27 -0700 Subject: [PATCH] be2net: Move the Emulex driver Moves the Emulex driver into drivers/net/ethernet/emulex/ and make the necessary Kconfig and Makefile changes. CC: Sathya Perla CC: Subbu Seetharaman CC: Ajit Khaparde Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- drivers/net/Kconfig | 2 -- drivers/net/Makefile | 1 - drivers/net/benet/Kconfig | 6 ----- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/emulex/Kconfig | 22 +++++++++++++++++++ drivers/net/ethernet/emulex/Makefile | 5 +++++ drivers/net/ethernet/emulex/benet/Kconfig | 6 +++++ .../net/{ => ethernet/emulex}/benet/Makefile | 0 drivers/net/{ => ethernet/emulex}/benet/be.h | 0 .../net/{ => ethernet/emulex}/benet/be_cmds.c | 0 .../net/{ => ethernet/emulex}/benet/be_cmds.h | 0 .../{ => ethernet/emulex}/benet/be_ethtool.c | 0 .../net/{ => ethernet/emulex}/benet/be_hw.h | 0 .../net/{ => ethernet/emulex}/benet/be_main.c | 0 16 files changed, 36 insertions(+), 10 deletions(-) delete mode 100644 drivers/net/benet/Kconfig create mode 100644 drivers/net/ethernet/emulex/Kconfig create mode 100644 drivers/net/ethernet/emulex/Makefile create mode 100644 drivers/net/ethernet/emulex/benet/Kconfig rename drivers/net/{ => ethernet/emulex}/benet/Makefile (100%) rename drivers/net/{ => ethernet/emulex}/benet/be.h (100%) rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.c (100%) rename drivers/net/{ => ethernet/emulex}/benet/be_cmds.h (100%) rename drivers/net/{ => ethernet/emulex}/benet/be_ethtool.c (100%) rename drivers/net/{ => ethernet/emulex}/benet/be_hw.h (100%) rename drivers/net/{ => ethernet/emulex}/benet/be_main.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 5a4c8758973e..7e51969ee05b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5746,7 +5746,7 @@ M: Ajit Khaparde 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 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fe227123a5f6..db03c21af203 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1598,8 +1598,6 @@ config BNA -source "drivers/net/benet/Kconfig" - endif # NETDEV_10000 source "drivers/net/tokenring/Kconfig" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index faf306865cbd..39b04e071af0 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 1a41a49bb619..000000000000 --- 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 0bc6635b071b..9c003f363a9d 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 50faab53b95b..2ac05bacab8f 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 000000000000..018ac94fb824 --- /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 + . + + 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 000000000000..ea8ec574d45a --- /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 000000000000..804db04a2bd0 --- /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 similarity index 100% rename from drivers/net/benet/Makefile rename to drivers/net/ethernet/emulex/benet/Makefile diff --git a/drivers/net/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h similarity index 100% rename from drivers/net/benet/be.h rename to 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 similarity index 100% rename from drivers/net/benet/be_cmds.c rename to 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 similarity index 100% rename from drivers/net/benet/be_cmds.h rename to 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 similarity index 100% rename from drivers/net/benet/be_ethtool.c rename to 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 similarity index 100% rename from drivers/net/benet/be_hw.h rename to 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 similarity index 100% rename from drivers/net/benet/be_main.c rename to drivers/net/ethernet/emulex/benet/be_main.c -- 2.20.1