diff --git a/MAINTAINERS b/MAINTAINERS index 7e51969ee05b1d45c3250da9919cf5568a6cbd56..0613e60fa6457a3c1c57521ae6bf58114d643830 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1576,7 +1576,7 @@ M: Rasesh Mody <rmody@brocade.com> M: Debashis Dutt <ddutt@brocade.com> L: netdev@vger.kernel.org S: Supported -F: drivers/net/bna/ +F: drivers/net/ethernet/brocade/bna/ BSG (block layer generic sg v4 driver) M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index db03c21af203f6797db0d0b3d1c302716b7c10b9..2701ee9190a18a665314b820e3c8e5c3b81160c1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1584,20 +1584,6 @@ config TEHUTI help Tehuti Networks 10G Ethernet NIC -config BNA - tristate "Brocade 1010/1020 10Gb Ethernet Driver support" - depends on PCI - ---help--- - This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet - cards. - To compile this driver as a module, choose M here: the module - will be called bna. - - For general information and support, go to the Brocade support - website at: - - <http://support.brocade.com> - endif # NETDEV_10000 source "drivers/net/tokenring/Kconfig" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 39b04e071af0fb532ea4973e0b954b9bb2f43602..c8a176f585a3688ba68b65c91994d962f24edfe4 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -25,7 +25,6 @@ obj-$(CONFIG_TEHUTI) += tehuti.o obj-$(CONFIG_ENIC) += enic/ obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_VMXNET3) += vmxnet3/ -obj-$(CONFIG_BNA) += bna/ gianfar_driver-objs := gianfar.o \ gianfar_ethtool.o \ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 9c003f363a9d1c243f0c8bfdc9d95bdf6d5f1e66..225918df224d13a708764eb1db5ba8bbc8e39027 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -15,6 +15,7 @@ source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/8390/Kconfig" 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/emulex/Kconfig" source "drivers/net/ethernet/intel/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 2ac05bacab8fa2a308a8ffddcea110d3c0697595..734f7c9d6649eadde0bc76a8dd8b637cdbffa19d 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 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_EMULEX) += emulex/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ diff --git a/drivers/net/ethernet/brocade/Kconfig b/drivers/net/ethernet/brocade/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..03f0b17b87c396ef6a3e70098c87619719bcc6e6 --- /dev/null +++ b/drivers/net/ethernet/brocade/Kconfig @@ -0,0 +1,22 @@ +# +# Brocade device configuration +# + +config NET_VENDOR_BROCADE + bool "Brocade devices" + depends on PCI + ---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 Brocade cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_BROCADE + +source "drivers/net/ethernet/brocade/bna/Kconfig" + +endif # NET_VENDOR_BROCADE diff --git a/drivers/net/ethernet/brocade/Makefile b/drivers/net/ethernet/brocade/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..b58238d2df6a1a92cd0e6801aa9d0c1ae56ab3b3 --- /dev/null +++ b/drivers/net/ethernet/brocade/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Brocade device drivers. +# + +obj-$(CONFIG_BNA) += bna/ diff --git a/drivers/net/ethernet/brocade/bna/Kconfig b/drivers/net/ethernet/brocade/bna/Kconfig new file mode 100644 index 0000000000000000000000000000000000000000..dc2eb526fbf7d4264a7996212de725a9577dd4ec --- /dev/null +++ b/drivers/net/ethernet/brocade/bna/Kconfig @@ -0,0 +1,17 @@ +# +# Brocade network device configuration +# + +config BNA + tristate "Brocade 1010/1020 10Gb Ethernet Driver support" + depends on PCI + ---help--- + This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet + cards. + To compile this driver as a module, choose M here: the module + will be called bna. + + For general information and support, go to the Brocade support + website at: + + <http://support.brocade.com> diff --git a/drivers/net/bna/Makefile b/drivers/net/ethernet/brocade/bna/Makefile similarity index 100% rename from drivers/net/bna/Makefile rename to drivers/net/ethernet/brocade/bna/Makefile diff --git a/drivers/net/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c similarity index 100% rename from drivers/net/bna/bfa_cee.c rename to drivers/net/ethernet/brocade/bna/bfa_cee.c diff --git a/drivers/net/bna/bfa_cee.h b/drivers/net/ethernet/brocade/bna/bfa_cee.h similarity index 100% rename from drivers/net/bna/bfa_cee.h rename to drivers/net/ethernet/brocade/bna/bfa_cee.h diff --git a/drivers/net/bna/bfa_cs.h b/drivers/net/ethernet/brocade/bna/bfa_cs.h similarity index 100% rename from drivers/net/bna/bfa_cs.h rename to drivers/net/ethernet/brocade/bna/bfa_cs.h diff --git a/drivers/net/bna/bfa_defs.h b/drivers/net/ethernet/brocade/bna/bfa_defs.h similarity index 100% rename from drivers/net/bna/bfa_defs.h rename to drivers/net/ethernet/brocade/bna/bfa_defs.h diff --git a/drivers/net/bna/bfa_defs_cna.h b/drivers/net/ethernet/brocade/bna/bfa_defs_cna.h similarity index 100% rename from drivers/net/bna/bfa_defs_cna.h rename to drivers/net/ethernet/brocade/bna/bfa_defs_cna.h diff --git a/drivers/net/bna/bfa_defs_mfg_comm.h b/drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h similarity index 100% rename from drivers/net/bna/bfa_defs_mfg_comm.h rename to drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h diff --git a/drivers/net/bna/bfa_defs_status.h b/drivers/net/ethernet/brocade/bna/bfa_defs_status.h similarity index 100% rename from drivers/net/bna/bfa_defs_status.h rename to drivers/net/ethernet/brocade/bna/bfa_defs_status.h diff --git a/drivers/net/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c similarity index 100% rename from drivers/net/bna/bfa_ioc.c rename to drivers/net/ethernet/brocade/bna/bfa_ioc.c diff --git a/drivers/net/bna/bfa_ioc.h b/drivers/net/ethernet/brocade/bna/bfa_ioc.h similarity index 100% rename from drivers/net/bna/bfa_ioc.h rename to drivers/net/ethernet/brocade/bna/bfa_ioc.h diff --git a/drivers/net/bna/bfa_ioc_ct.c b/drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c similarity index 100% rename from drivers/net/bna/bfa_ioc_ct.c rename to drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c diff --git a/drivers/net/bna/bfi.h b/drivers/net/ethernet/brocade/bna/bfi.h similarity index 100% rename from drivers/net/bna/bfi.h rename to drivers/net/ethernet/brocade/bna/bfi.h diff --git a/drivers/net/bna/bfi_cna.h b/drivers/net/ethernet/brocade/bna/bfi_cna.h similarity index 100% rename from drivers/net/bna/bfi_cna.h rename to drivers/net/ethernet/brocade/bna/bfi_cna.h diff --git a/drivers/net/bna/bfi_ll.h b/drivers/net/ethernet/brocade/bna/bfi_ll.h similarity index 100% rename from drivers/net/bna/bfi_ll.h rename to drivers/net/ethernet/brocade/bna/bfi_ll.h diff --git a/drivers/net/bna/bfi_reg.h b/drivers/net/ethernet/brocade/bna/bfi_reg.h similarity index 100% rename from drivers/net/bna/bfi_reg.h rename to drivers/net/ethernet/brocade/bna/bfi_reg.h diff --git a/drivers/net/bna/bna.h b/drivers/net/ethernet/brocade/bna/bna.h similarity index 100% rename from drivers/net/bna/bna.h rename to drivers/net/ethernet/brocade/bna/bna.h diff --git a/drivers/net/bna/bna_ctrl.c b/drivers/net/ethernet/brocade/bna/bna_ctrl.c similarity index 100% rename from drivers/net/bna/bna_ctrl.c rename to drivers/net/ethernet/brocade/bna/bna_ctrl.c diff --git a/drivers/net/bna/bna_hw.h b/drivers/net/ethernet/brocade/bna/bna_hw.h similarity index 100% rename from drivers/net/bna/bna_hw.h rename to drivers/net/ethernet/brocade/bna/bna_hw.h diff --git a/drivers/net/bna/bna_txrx.c b/drivers/net/ethernet/brocade/bna/bna_txrx.c similarity index 100% rename from drivers/net/bna/bna_txrx.c rename to drivers/net/ethernet/brocade/bna/bna_txrx.c diff --git a/drivers/net/bna/bna_types.h b/drivers/net/ethernet/brocade/bna/bna_types.h similarity index 100% rename from drivers/net/bna/bna_types.h rename to drivers/net/ethernet/brocade/bna/bna_types.h diff --git a/drivers/net/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c similarity index 100% rename from drivers/net/bna/bnad.c rename to drivers/net/ethernet/brocade/bna/bnad.c diff --git a/drivers/net/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h similarity index 100% rename from drivers/net/bna/bnad.h rename to drivers/net/ethernet/brocade/bna/bnad.h diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c similarity index 100% rename from drivers/net/bna/bnad_ethtool.c rename to drivers/net/ethernet/brocade/bna/bnad_ethtool.c diff --git a/drivers/net/bna/cna.h b/drivers/net/ethernet/brocade/bna/cna.h similarity index 100% rename from drivers/net/bna/cna.h rename to drivers/net/ethernet/brocade/bna/cna.h diff --git a/drivers/net/bna/cna_fwimg.c b/drivers/net/ethernet/brocade/bna/cna_fwimg.c similarity index 100% rename from drivers/net/bna/cna_fwimg.c rename to drivers/net/ethernet/brocade/bna/cna_fwimg.c