diff options
author | Jeff Kirsher | 2011-05-13 01:00:03 -0700 |
---|---|---|
committer | Jeff Kirsher | 2011-08-11 02:41:14 -0700 |
commit | f844a0ead401c3ce0f01a8bb4d6cea2f0f6ad863 (patch) | |
tree | b929c2ecdac479844e503e51164dd9bf09609a32 /drivers/net | |
parent | 9aebddd11be42366f89b0296590770c02797aa98 (diff) |
bna: Move the Brocade driver
Moves the Brocade driver into drivers/net/ethernet/brocade/ and make
the necessary Kconfig and Makefile changes.
CC: Rasesh Mody <rmody@brocade.com>
CC: Debashis Dutt <ddutt@brocade.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 14 | ||||
-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/brocade/Kconfig | 22 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/Makefile | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/Kconfig | 17 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/Makefile (renamed from drivers/net/bna/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_cee.c (renamed from drivers/net/bna/bfa_cee.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_cee.h (renamed from drivers/net/bna/bfa_cee.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_cs.h (renamed from drivers/net/bna/bfa_cs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_defs.h (renamed from drivers/net/bna/bfa_defs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_defs_cna.h (renamed from drivers/net/bna/bfa_defs_cna.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h (renamed from drivers/net/bna/bfa_defs_mfg_comm.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_defs_status.h (renamed from drivers/net/bna/bfa_defs_status.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc.c (renamed from drivers/net/bna/bfa_ioc.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc.h (renamed from drivers/net/bna/bfa_ioc.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c (renamed from drivers/net/bna/bfa_ioc_ct.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfi.h (renamed from drivers/net/bna/bfi.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfi_cna.h (renamed from drivers/net/bna/bfi_cna.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfi_ll.h (renamed from drivers/net/bna/bfi_ll.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfi_reg.h (renamed from drivers/net/bna/bfi_reg.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna.h (renamed from drivers/net/bna/bna.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_ctrl.c (renamed from drivers/net/bna/bna_ctrl.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_hw.h (renamed from drivers/net/bna/bna_hw.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_txrx.c (renamed from drivers/net/bna/bna_txrx.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bna_types.h (renamed from drivers/net/bna/bna_types.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad.c (renamed from drivers/net/bna/bnad.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad.h (renamed from drivers/net/bna/bnad.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad_ethtool.c (renamed from drivers/net/bna/bnad_ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/cna.h (renamed from drivers/net/bna/cna.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/brocade/bna/cna_fwimg.c (renamed from drivers/net/bna/cna_fwimg.c) | 0 |
32 files changed, 46 insertions, 15 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index db03c21af203..2701ee9190a1 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 39b04e071af0..c8a176f585a3 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 9c003f363a9d..225918df224d 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 2ac05bacab8f..734f7c9d6649 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 000000000000..03f0b17b87c3 --- /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 000000000000..b58238d2df6a --- /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 000000000000..dc2eb526fbf7 --- /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 index a5d604de7fea..a5d604de7fea 100644 --- a/drivers/net/bna/Makefile +++ b/drivers/net/ethernet/brocade/bna/Makefile diff --git a/drivers/net/bna/bfa_cee.c b/drivers/net/ethernet/brocade/bna/bfa_cee.c index 39e5ab9fde59..39e5ab9fde59 100644 --- a/drivers/net/bna/bfa_cee.c +++ b/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 index 58d54e98d595..58d54e98d595 100644 --- a/drivers/net/bna/bfa_cee.h +++ b/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 index 3da1a946ccdd..3da1a946ccdd 100644 --- a/drivers/net/bna/bfa_cs.h +++ b/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 index b080b3698f48..b080b3698f48 100644 --- a/drivers/net/bna/bfa_defs.h +++ b/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 index 7e0a9187bdd5..7e0a9187bdd5 100644 --- a/drivers/net/bna/bfa_defs_cna.h +++ b/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 index 885ef3afdd4e..885ef3afdd4e 100644 --- a/drivers/net/bna/bfa_defs_mfg_comm.h +++ b/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 index 7c5fe6c2e80e..7c5fe6c2e80e 100644 --- a/drivers/net/bna/bfa_defs_status.h +++ b/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 index 3cdea65aee12..3cdea65aee12 100644 --- a/drivers/net/bna/bfa_ioc.c +++ b/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 index bda866ba6e90..bda866ba6e90 100644 --- a/drivers/net/bna/bfa_ioc.h +++ b/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 index 209f1f320343..209f1f320343 100644 --- a/drivers/net/bna/bfa_ioc_ct.c +++ b/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 index 088211c2724f..088211c2724f 100644 --- a/drivers/net/bna/bfi.h +++ b/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 index 4eecabea397b..4eecabea397b 100644 --- a/drivers/net/bna/bfi_cna.h +++ b/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 index bee4d054066a..bee4d054066a 100644 --- a/drivers/net/bna/bfi_ll.h +++ b/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 index efacff3ab51d..efacff3ab51d 100644 --- a/drivers/net/bna/bfi_reg.h +++ b/drivers/net/ethernet/brocade/bna/bfi_reg.h diff --git a/drivers/net/bna/bna.h b/drivers/net/ethernet/brocade/bna/bna.h index 21e9155d6e56..21e9155d6e56 100644 --- a/drivers/net/bna/bna.h +++ b/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 index cb2594c564dc..cb2594c564dc 100644 --- a/drivers/net/bna/bna_ctrl.c +++ b/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 index 16a5eed4a03b..16a5eed4a03b 100644 --- a/drivers/net/bna/bna_hw.h +++ b/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 index f0983c832447..f0983c832447 100644 --- a/drivers/net/bna/bna_txrx.c +++ b/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 index 2f89cb235248..2f89cb235248 100644 --- a/drivers/net/bna/bna_types.h +++ b/drivers/net/ethernet/brocade/bna/bna_types.h diff --git a/drivers/net/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 8e35b2596f93..8e35b2596f93 100644 --- a/drivers/net/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c diff --git a/drivers/net/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h index 458eb30371b5..458eb30371b5 100644 --- a/drivers/net/bna/bnad.h +++ b/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 index 49174f87f4d1..49174f87f4d1 100644 --- a/drivers/net/bna/bnad_ethtool.c +++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c diff --git a/drivers/net/bna/cna.h b/drivers/net/ethernet/brocade/bna/cna.h index a679e038747b..a679e038747b 100644 --- a/drivers/net/bna/cna.h +++ b/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 index e8f4ecd9ebb5..e8f4ecd9ebb5 100644 --- a/drivers/net/bna/cna_fwimg.c +++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c |