tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Jeff Kirsher f844a0ea 9aebddd1

+47 -16
+1 -1
MAINTAINERS
··· 1576 1576 M: Debashis Dutt <ddutt@brocade.com> 1577 1577 L: netdev@vger.kernel.org 1578 1578 S: Supported 1579 - F: drivers/net/bna/ 1579 + F: drivers/net/ethernet/brocade/bna/ 1580 1580 1581 1581 BSG (block layer generic sg v4 driver) 1582 1582 M: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-14
drivers/net/Kconfig
··· 1584 1584 help 1585 1585 Tehuti Networks 10G Ethernet NIC 1586 1586 1587 - config BNA 1588 - tristate "Brocade 1010/1020 10Gb Ethernet Driver support" 1589 - depends on PCI 1590 - ---help--- 1591 - This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet 1592 - cards. 1593 - To compile this driver as a module, choose M here: the module 1594 - will be called bna. 1595 - 1596 - For general information and support, go to the Brocade support 1597 - website at: 1598 - 1599 - <http://support.brocade.com> 1600 - 1601 1587 endif # NETDEV_10000 1602 1588 1603 1589 source "drivers/net/tokenring/Kconfig"
-1
drivers/net/Makefile
··· 25 25 obj-$(CONFIG_ENIC) += enic/ 26 26 obj-$(CONFIG_JME) += jme.o 27 27 obj-$(CONFIG_VMXNET3) += vmxnet3/ 28 - obj-$(CONFIG_BNA) += bna/ 29 28 30 29 gianfar_driver-objs := gianfar.o \ 31 30 gianfar_ethtool.o \
drivers/net/bna/Makefile drivers/net/ethernet/brocade/bna/Makefile
drivers/net/bna/bfa_cee.c drivers/net/ethernet/brocade/bna/bfa_cee.c
drivers/net/bna/bfa_cee.h drivers/net/ethernet/brocade/bna/bfa_cee.h
drivers/net/bna/bfa_cs.h drivers/net/ethernet/brocade/bna/bfa_cs.h
drivers/net/bna/bfa_defs.h drivers/net/ethernet/brocade/bna/bfa_defs.h
drivers/net/bna/bfa_defs_cna.h drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
drivers/net/bna/bfa_defs_mfg_comm.h drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
drivers/net/bna/bfa_defs_status.h drivers/net/ethernet/brocade/bna/bfa_defs_status.h
drivers/net/bna/bfa_ioc.c drivers/net/ethernet/brocade/bna/bfa_ioc.c
drivers/net/bna/bfa_ioc.h drivers/net/ethernet/brocade/bna/bfa_ioc.h
drivers/net/bna/bfa_ioc_ct.c drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
drivers/net/bna/bfi.h drivers/net/ethernet/brocade/bna/bfi.h
drivers/net/bna/bfi_cna.h drivers/net/ethernet/brocade/bna/bfi_cna.h
drivers/net/bna/bfi_ll.h drivers/net/ethernet/brocade/bna/bfi_ll.h
drivers/net/bna/bfi_reg.h drivers/net/ethernet/brocade/bna/bfi_reg.h
drivers/net/bna/bna.h drivers/net/ethernet/brocade/bna/bna.h
drivers/net/bna/bna_ctrl.c drivers/net/ethernet/brocade/bna/bna_ctrl.c
drivers/net/bna/bna_hw.h drivers/net/ethernet/brocade/bna/bna_hw.h
drivers/net/bna/bna_txrx.c drivers/net/ethernet/brocade/bna/bna_txrx.c
drivers/net/bna/bna_types.h drivers/net/ethernet/brocade/bna/bna_types.h
drivers/net/bna/bnad.c drivers/net/ethernet/brocade/bna/bnad.c
drivers/net/bna/bnad.h drivers/net/ethernet/brocade/bna/bnad.h
drivers/net/bna/bnad_ethtool.c drivers/net/ethernet/brocade/bna/bnad_ethtool.c
drivers/net/bna/cna.h drivers/net/ethernet/brocade/bna/cna.h
drivers/net/bna/cna_fwimg.c drivers/net/ethernet/brocade/bna/cna_fwimg.c
+1
drivers/net/ethernet/Kconfig
··· 15 15 source "drivers/net/ethernet/8390/Kconfig" 16 16 source "drivers/net/ethernet/amd/Kconfig" 17 17 source "drivers/net/ethernet/broadcom/Kconfig" 18 + source "drivers/net/ethernet/brocade/Kconfig" 18 19 source "drivers/net/ethernet/chelsio/Kconfig" 19 20 source "drivers/net/ethernet/emulex/Kconfig" 20 21 source "drivers/net/ethernet/intel/Kconfig"
+1
drivers/net/ethernet/Makefile
··· 6 6 obj-$(CONFIG_NET_VENDOR_8390) += 8390/ 7 7 obj-$(CONFIG_NET_VENDOR_AMD) += amd/ 8 8 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ 9 + obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/ 9 10 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ 10 11 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/ 11 12 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+22
drivers/net/ethernet/brocade/Kconfig
··· 1 + # 2 + # Brocade device configuration 3 + # 4 + 5 + config NET_VENDOR_BROCADE 6 + bool "Brocade devices" 7 + depends on PCI 8 + ---help--- 9 + If you have a network (Ethernet) card belonging to this class, say Y 10 + and read the Ethernet-HOWTO, available from 11 + <http://www.tldp.org/docs.html#howto>. 12 + 13 + Note that the answer to this question doesn't directly affect the 14 + kernel: saying N will just cause the configurator to skip all 15 + the questions about Brocade cards. If you say Y, you will be asked for 16 + your specific card in the following questions. 17 + 18 + if NET_VENDOR_BROCADE 19 + 20 + source "drivers/net/ethernet/brocade/bna/Kconfig" 21 + 22 + endif # NET_VENDOR_BROCADE
+5
drivers/net/ethernet/brocade/Makefile
··· 1 + # 2 + # Makefile for the Brocade device drivers. 3 + # 4 + 5 + obj-$(CONFIG_BNA) += bna/
+17
drivers/net/ethernet/brocade/bna/Kconfig
··· 1 + # 2 + # Brocade network device configuration 3 + # 4 + 5 + config BNA 6 + tristate "Brocade 1010/1020 10Gb Ethernet Driver support" 7 + depends on PCI 8 + ---help--- 9 + This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet 10 + cards. 11 + To compile this driver as a module, choose M here: the module 12 + will be called bna. 13 + 14 + For general information and support, go to the Brocade support 15 + website at: 16 + 17 + <http://support.brocade.com>