From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Rasesh Mody <rmody@brocade.com>,
Debashis Dutt <ddutt@brocade.com>
Subject: [net-next 05/10] bna: Move the Brocade driver
Date: Thu, 11 Aug 2011 02:51:29 -0700 [thread overview]
Message-ID: <1313056294-28426-6-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1313056294-28426-1-git-send-email-jeffrey.t.kirsher@intel.com>
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>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 14 ------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/brocade/Kconfig | 22 ++++++++++++++++++++
drivers/net/ethernet/brocade/Makefile | 5 ++++
drivers/net/ethernet/brocade/bna/Kconfig | 17 +++++++++++++++
drivers/net/{ => ethernet/brocade}/bna/Makefile | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_defs_cna.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h | 0
.../{ => ethernet/brocade}/bna/bfa_defs_status.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h | 0
.../net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c | 0
drivers/net/{ => ethernet/brocade}/bna/bfi.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_reg.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_hw.h | 0
drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c | 0
drivers/net/{ => ethernet/brocade}/bna/bna_types.h | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.c | 0
drivers/net/{ => ethernet/brocade}/bna/bnad.h | 0
.../net/{ => ethernet/brocade}/bna/bnad_ethtool.c | 0
drivers/net/{ => ethernet/brocade}/bna/cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c | 0
33 files changed, 47 insertions(+), 16 deletions(-)
create mode 100644 drivers/net/ethernet/brocade/Kconfig
create mode 100644 drivers/net/ethernet/brocade/Makefile
create mode 100644 drivers/net/ethernet/brocade/bna/Kconfig
rename drivers/net/{ => ethernet/brocade}/bna/Makefile (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cee.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_cs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_mfg_comm.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_defs_status.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_ioc_ct.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_reg.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_ctrl.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_hw.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_txrx.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bna_types.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bnad_ethtool.c (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/cna_fwimg.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7e51969..0613e60 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 db03c21..2701ee9 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 39b04e0..c8a176f 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 9c003f3..225918d 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 2ac05ba..734f7c9 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 0000000..03f0b17
--- /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 0000000..b58238d
--- /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 0000000..dc2eb52
--- /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
--
1.7.6
next prev parent reply other threads:[~2011-08-11 9:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-11 9:51 [net-next 00/10] drivers/net organize Ethernet drivers (2nd series) Jeff Kirsher
2011-08-11 9:51 ` [net-next 01/10] ni5010: Move the Racal-Interlan (Micom) driver Jeff Kirsher
2011-08-11 9:51 ` [net-next 02/10] cassini/niu/sun*: Move the Sun drivers Jeff Kirsher
2011-08-11 9:51 ` [net-next 03/10] sfc: Move the Solarflare drivers Jeff Kirsher
2011-08-11 9:51 ` [net-next 04/10] be2net: Move the Emulex driver Jeff Kirsher
2011-08-11 9:51 ` Jeff Kirsher [this message]
2011-08-11 9:51 ` [net-next 06/10] mlx4: Move the Mellanox driver Jeff Kirsher
2011-08-11 9:51 ` [net-next 07/10] myri*: Move the Myricom drivers Jeff Kirsher
2011-08-11 9:51 ` [net-next 08/10] s2io/vxge: Move the Exar drivers Jeff Kirsher
2011-08-11 9:51 ` [net-next 09/10] ehea/ibm*: Move the IBM drivers Jeff Kirsher
2011-08-11 9:51 ` [net-next 10/10] enic: Move the Cisco driver Jeff Kirsher
2011-08-11 10:31 ` [net-next 00/10] drivers/net organize Ethernet drivers (2nd series) David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1313056294-28426-6-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=ddutt@brocade.com \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=rmody@brocade.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.