* [RFC 35/72] via-*: Move the VIA drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Roger Luethi, Francois Romieu
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the VIA drivers into drivers/net/ethernet/via/ and make the
necessary Kconfig and Makefile changes.
CC: Roger Luethi <rl@hellgate.ch>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 36 -----------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/via/Kconfig | 52 +++++++++++++++++++++++++
drivers/net/ethernet/via/Makefile | 6 +++
drivers/net/{ => ethernet/via}/via-rhine.c | 0
drivers/net/{ => ethernet/via}/via-velocity.c | 0
drivers/net/{ => ethernet/via}/via-velocity.h | 0
10 files changed, 62 insertions(+), 40 deletions(-)
create mode 100644 drivers/net/ethernet/via/Kconfig
create mode 100644 drivers/net/ethernet/via/Makefile
rename drivers/net/{ => ethernet/via}/via-rhine.c (100%)
rename drivers/net/{ => ethernet/via}/via-velocity.c (100%)
rename drivers/net/{ => ethernet/via}/via-velocity.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 98b3caf..70df907 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6749,7 +6749,7 @@ F: include/linux/vhost.h
VIA RHINE NETWORK DRIVER
M: Roger Luethi <rl@hellgate.ch>
S: Maintained
-F: drivers/net/via-rhine.c
+F: drivers/net/ethernet/via/via-rhine.c
VIAPRO SMBUS DRIVER
M: Jean Delvare <khali@linux-fr.org>
@@ -6777,7 +6777,7 @@ VIA VELOCITY NETWORK DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/via-velocity.*
+F: drivers/net/ethernet/via/via-velocity.*
VLAN (802.1Q)
M: Patrick McHardy <kaber@trash.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1f0c3bf..bb68fac 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -767,30 +767,6 @@ config KS8851_MLL
This platform driver is for Micrel KS8851 Address/data bus
multiplexed network chip.
-config VIA_RHINE
- tristate "VIA Rhine support"
- depends on NET_PCI && PCI
- select CRC32
- select MII
- help
- If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
- Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
- Ethernet functions can also be found integrated on South Bridges
- (e.g. VT8235).
-
- To compile this driver as a module, choose M here. The module
- will be called via-rhine.
-
-config VIA_RHINE_MMIO
- bool "Use MMIO instead of PIO"
- depends on VIA_RHINE
- help
- This instructs the driver to use PCI shared memory (MMIO) instead of
- programmed I/O ports (PIO). Enabling this gives an improvement in
- processing time in parts of the driver.
-
- If unsure, say Y.
-
config SC92031
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
depends on NET_PCI && PCI && EXPERIMENTAL
@@ -967,18 +943,6 @@ config SIS190
To compile this driver as a module, choose M here: the module
will be called sis190. This is recommended.
-config VIA_VELOCITY
- tristate "VIA Velocity support"
- depends on PCI
- select CRC32
- select CRC_CCITT
- select MII
- help
- If you have a VIA "Velocity" based network card say Y here.
-
- To compile this driver as a module, choose M here. The module
- will be called via-velocity.
-
config SPIDER_NET
tristate "Spider Gigabit Ethernet driver"
depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f32b45c..47decf6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -48,8 +48,6 @@ obj-$(CONFIG_KS8842) += ks8842.o
obj-$(CONFIG_KS8851) += ks8851.o
obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o
-obj-$(CONFIG_VIA_RHINE) += via-rhine.o
-obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_SH_ETH) += sh_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 2795982..be94115 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -59,5 +59,6 @@ config TEHUTI
Tehuti Networks 10G Ethernet NIC
source "drivers/net/ethernet/tulip/Kconfig"
+source "drivers/net/ethernet/via/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index eb3d827..e07d818 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -35,3 +35,4 @@ obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_NET_TULIP) += tulip/
+obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig
new file mode 100644
index 0000000..e606aa1
--- /dev/null
+++ b/drivers/net/ethernet/via/Kconfig
@@ -0,0 +1,52 @@
+#
+# VIA device configuration
+#
+
+config NET_VENDOR_VIA
+ bool "VIA 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 VIA devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config VIA_RHINE
+ tristate "VIA Rhine support"
+ depends on NET_VENDOR_VIA && PCI
+ select CRC32
+ select MII
+ ---help---
+ If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
+ Rhine-II (VT6102), or Rhine-III (VT6105)), say Y here. Rhine-type
+ Ethernet functions can also be found integrated on South Bridges
+ (e.g. VT8235).
+
+ To compile this driver as a module, choose M here. The module
+ will be called via-rhine.
+
+config VIA_RHINE_MMIO
+ bool "Use MMIO instead of PIO"
+ depends on VIA_RHINE
+ ---help---
+ This instructs the driver to use PCI shared memory (MMIO) instead of
+ programmed I/O ports (PIO). Enabling this gives an improvement in
+ processing time in parts of the driver.
+
+ If unsure, say Y.
+
+config VIA_VELOCITY
+ tristate "VIA Velocity support"
+ depends on NET_VENDOR_VIA && PCI
+ select CRC32
+ select CRC_CCITT
+ select MII
+ ---help---
+ If you have a VIA "Velocity" based network card say Y here.
+
+ To compile this driver as a module, choose M here. The module
+ will be called via-velocity.
diff --git a/drivers/net/ethernet/via/Makefile b/drivers/net/ethernet/via/Makefile
new file mode 100644
index 0000000..46c5d4a
--- /dev/null
+++ b/drivers/net/ethernet/via/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the VIA device drivers.
+#
+
+obj-$(CONFIG_VIA_RHINE) += via-rhine.o
+obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
diff --git a/drivers/net/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
similarity index 100%
rename from drivers/net/via-rhine.c
rename to drivers/net/ethernet/via/via-rhine.c
diff --git a/drivers/net/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
similarity index 100%
rename from drivers/net/via-velocity.c
rename to drivers/net/ethernet/via/via-velocity.c
diff --git a/drivers/net/via-velocity.h b/drivers/net/ethernet/via/via-velocity.h
similarity index 100%
rename from drivers/net/via-velocity.h
rename to drivers/net/ethernet/via/via-velocity.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 14/72] bna: Move the Brocade driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Rasesh Mody, Debashis Dutt
In-Reply-To: <1309010363-22750-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 | 18 ++++++++++++++++++
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_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/bfa_sm.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_cna.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ctreg.h | 0
drivers/net/{ => ethernet/brocade}/bna/bfi_ll.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
34 files changed, 43 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_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/bfa_sm.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfa_wc.h (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_ctreg.h (100%)
rename drivers/net/{ => ethernet/brocade}/bna/bfi_ll.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 5bf6ae2..b73e10b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1550,7 +1550,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 5218303..c3ab3e7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1767,20 +1767,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 5e1ccb5..f480771 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 97a4b57..aae207a 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 bf9b2e9..9494827 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..8d8bff7
--- /dev/null
+++ b/drivers/net/ethernet/brocade/Kconfig
@@ -0,0 +1,18 @@
+#
+# 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.
+
+source "drivers/net/ethernet/brocade/bna/Kconfig"
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..ba37af2
--- /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 NET_VENDOR_BROCADE && 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_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/bfa_sm.h b/drivers/net/ethernet/brocade/bna/bfa_sm.h
similarity index 100%
rename from drivers/net/bna/bfa_sm.h
rename to drivers/net/ethernet/brocade/bna/bfa_sm.h
diff --git a/drivers/net/bna/bfa_wc.h b/drivers/net/ethernet/brocade/bna/bfa_wc.h
similarity index 100%
rename from drivers/net/bna/bfa_wc.h
rename to drivers/net/ethernet/brocade/bna/bfa_wc.h
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_ctreg.h b/drivers/net/ethernet/brocade/bna/bfi_ctreg.h
similarity index 100%
rename from drivers/net/bna/bfi_ctreg.h
rename to drivers/net/ethernet/brocade/bna/bfi_ctreg.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/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.5.4
^ permalink raw reply related
* [RFC 30/72] atl*: Move the Atheros drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Jay Cliburn, Chris Snook, Jie Yang
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Atheros drivers into drivers/net/ethernet/atheros/ and
make the necessary Kconfig and Makefile changes.
CC: Jay Cliburn <jcliburn@gmail.com>
CC: Chris Snook <chris.snook@gmail.com>
CC: Jie Yang <jie.yang@atheros.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 45 --------------
drivers/net/Makefile | 4 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/atheros/Kconfig | 61 ++++++++++++++++++++
drivers/net/ethernet/atheros/Makefile | 8 +++
drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
.../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
.../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
.../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
.../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
.../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
.../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
27 files changed, 72 insertions(+), 50 deletions(-)
create mode 100644 drivers/net/ethernet/atheros/Kconfig
create mode 100644 drivers/net/ethernet/atheros/Makefile
rename drivers/net/{ => ethernet/atheros}/atl1c/Makefile (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_ethtool.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_hw.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1c/atl1c_main.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/Makefile (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_ethtool.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_hw.h (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_main.c (100%)
rename drivers/net/{ => ethernet/atheros}/atl1e/atl1e_param.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/Makefile (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl1.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl1.h (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl2.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atl2.h (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atlx.c (100%)
rename drivers/net/{ => ethernet/atheros}/atlx/atlx.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index a0ccbea..f72a8bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1263,7 +1263,7 @@ L: netdev@vger.kernel.org
W: http://sourceforge.net/projects/atl1
W: http://atl1.sourceforge.net
S: Maintained
-F: drivers/net/atlx/
+F: drivers/net/ethernet/atheros/
ATM
M: Chas Williams <chas@cmf.nrl.navy.mil>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 3961949..71efbe4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -897,17 +897,6 @@ config FEC_MPC52xx_MDIO
If not sure, enable.
If compiled as module, it will be called fec_mpc52xx_phy.
-config ATL2
- tristate "Atheros L2 Fast Ethernet support"
- depends on PCI
- select CRC32
- select MII
- help
- This driver supports the Atheros L2 fast ethernet adapter.
-
- To compile this driver as a module, choose M here. The module
- will be called atl2.
-
config XILINX_EMACLITE
tristate "Xilinx 10/100 Ethernet Lite support"
depends on PPC32 || MICROBLAZE
@@ -1161,40 +1150,6 @@ config XILINX_LL_TEMAC
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
core used in Xilinx Spartan and Virtex FPGAs
-config ATL1
- tristate "Atheros/Attansic L1 Gigabit Ethernet support"
- depends on PCI
- select CRC32
- select MII
- help
- This driver supports the Atheros/Attansic L1 gigabit ethernet
- adapter.
-
- To compile this driver as a module, choose M here. The module
- will be called atl1.
-
-config ATL1E
- tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
- select CRC32
- select MII
- help
- This driver supports the Atheros L1E gigabit ethernet adapter.
-
- To compile this driver as a module, choose M here. The module
- will be called atl1e.
-
-config ATL1C
- tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
- select CRC32
- select MII
- help
- This driver supports the Atheros L1C gigabit ethernet adapter.
-
- To compile this driver as a module, choose M here. The module
- will be called atl1c.
-
config JME
tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8cdf289..1ac4164 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -9,10 +9,6 @@ obj-$(CONFIG_PHYLIB) += phy/
obj-$(CONFIG_IP1000) += ipg.o
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_ATL1) += atlx/
-obj-$(CONFIG_ATL2) += atlx/
-obj-$(CONFIG_ATL1E) += atl1e/
-obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
obj-$(CONFIG_JME) += jme.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index b665c32..6fb1625 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/amd/Kconfig"
source "drivers/net/ethernet/apple/Kconfig"
source "drivers/net/ethernet/arm/Kconfig"
+source "drivers/net/ethernet/atheros/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index e3c7243..1123a3d 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_APPLE) += apple/
obj-$(CONFIG_NET_ARM) += arm/
+obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig
new file mode 100644
index 0000000..94b436d
--- /dev/null
+++ b/drivers/net/ethernet/atheros/Kconfig
@@ -0,0 +1,61 @@
+#
+# Atheros device configuration
+#
+
+config NET_VENDOR_ATHEROS
+ bool "Atheros 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 Atheros devices. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+config ATL2
+ tristate "Atheros L2 Fast Ethernet support"
+ depends on NET_VENDOR_ATHEROS && PCI
+ select CRC32
+ select MII
+ ---help---
+ This driver supports the Atheros L2 fast ethernet adapter.
+
+ To compile this driver as a module, choose M here. The module
+ will be called atl2.
+
+config ATL1
+ tristate "Atheros/Attansic L1 Gigabit Ethernet support"
+ depends on NET_VENDOR_ATHEROS && PCI
+ select CRC32
+ select MII
+ ---help---
+ This driver supports the Atheros/Attansic L1 gigabit ethernet
+ adapter.
+
+ To compile this driver as a module, choose M here. The module
+ will be called atl1.
+
+config ATL1E
+ tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
+ depends on NET_VENDOR_ATHEROS && PCI && EXPERIMENTAL
+ select CRC32
+ select MII
+ ---help---
+ This driver supports the Atheros L1E gigabit ethernet adapter.
+
+ To compile this driver as a module, choose M here. The module
+ will be called atl1e.
+
+config ATL1C
+ tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
+ depends on NET_VENDOR_ATHEROS && PCI && EXPERIMENTAL
+ select CRC32
+ select MII
+ ---help---
+ This driver supports the Atheros L1C gigabit ethernet adapter.
+
+ To compile this driver as a module, choose M here. The module
+ will be called atl1c.
diff --git a/drivers/net/ethernet/atheros/Makefile b/drivers/net/ethernet/atheros/Makefile
new file mode 100644
index 0000000..e7e76fb
--- /dev/null
+++ b/drivers/net/ethernet/atheros/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Atheros network device drivers.
+#
+
+obj-$(CONFIG_ATL1) += atlx/
+obj-$(CONFIG_ATL2) += atlx/
+obj-$(CONFIG_ATL1E) += atl1e/
+obj-$(CONFIG_ATL1C) += atl1c/
diff --git a/drivers/net/atl1c/Makefile b/drivers/net/ethernet/atheros/atl1c/Makefile
similarity index 100%
rename from drivers/net/atl1c/Makefile
rename to drivers/net/ethernet/atheros/atl1c/Makefile
diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
similarity index 100%
rename from drivers/net/atl1c/atl1c.h
rename to drivers/net/ethernet/atheros/atl1c/atl1c.h
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_ethtool.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_hw.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
similarity index 100%
rename from drivers/net/atl1c/atl1c_hw.h
rename to drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_main.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_main.c
diff --git a/drivers/net/atl1e/Makefile b/drivers/net/ethernet/atheros/atl1e/Makefile
similarity index 100%
rename from drivers/net/atl1e/Makefile
rename to drivers/net/ethernet/atheros/atl1e/Makefile
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h
similarity index 100%
rename from drivers/net/atl1e/atl1e.h
rename to drivers/net/ethernet/atheros/atl1e/atl1e.h
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_ethtool.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
diff --git a/drivers/net/atl1e/atl1e_hw.c b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_hw.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
diff --git a/drivers/net/atl1e/atl1e_hw.h b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.h
similarity index 100%
rename from drivers/net/atl1e/atl1e_hw.h
rename to drivers/net/ethernet/atheros/atl1e/atl1e_hw.h
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_main.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_main.c
diff --git a/drivers/net/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_param.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_param.c
diff --git a/drivers/net/atlx/Makefile b/drivers/net/ethernet/atheros/atlx/Makefile
similarity index 100%
rename from drivers/net/atlx/Makefile
rename to drivers/net/ethernet/atheros/atlx/Makefile
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
similarity index 100%
rename from drivers/net/atlx/atl1.c
rename to drivers/net/ethernet/atheros/atlx/atl1.c
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h
similarity index 100%
rename from drivers/net/atlx/atl1.h
rename to drivers/net/ethernet/atheros/atlx/atl1.h
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
similarity index 100%
rename from drivers/net/atlx/atl2.c
rename to drivers/net/ethernet/atheros/atlx/atl2.c
diff --git a/drivers/net/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h
similarity index 100%
rename from drivers/net/atlx/atl2.h
rename to drivers/net/ethernet/atheros/atlx/atl2.h
diff --git a/drivers/net/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
similarity index 100%
rename from drivers/net/atlx/atlx.c
rename to drivers/net/ethernet/atheros/atlx/atlx.c
diff --git a/drivers/net/atlx/atlx.h b/drivers/net/ethernet/atheros/atlx/atlx.h
similarity index 100%
rename from drivers/net/atlx/atlx.h
rename to drivers/net/ethernet/atheros/atlx/atlx.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 31/72] tulip: Move the tulip drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Tobias Ringstrom, Grant Grundler
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the tulip driver into drivers/net/ethernet/tulip/ and make
the necessary Kconfig and Makefile changes.
CC: Tobias Ringstrom <tori@unhappy.mine.nu>
CC: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 2 -
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 2 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/tulip/21142.c | 0
drivers/net/{ => ethernet}/tulip/Kconfig | 34 ++++++++++-------------
drivers/net/{ => ethernet}/tulip/Makefile | 0
drivers/net/{ => ethernet}/tulip/de2104x.c | 0
drivers/net/{ => ethernet}/tulip/de4x5.c | 0
drivers/net/{ => ethernet}/tulip/de4x5.h | 0
drivers/net/{ => ethernet}/tulip/dmfe.c | 0
drivers/net/{ => ethernet}/tulip/eeprom.c | 0
drivers/net/{ => ethernet}/tulip/interrupt.c | 0
drivers/net/{ => ethernet}/tulip/media.c | 0
drivers/net/{ => ethernet}/tulip/pnic.c | 0
drivers/net/{ => ethernet}/tulip/pnic2.c | 0
drivers/net/{ => ethernet}/tulip/timer.c | 0
drivers/net/{ => ethernet}/tulip/tulip.h | 0
drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
drivers/net/{ => ethernet}/tulip/uli526x.c | 0
drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
23 files changed, 20 insertions(+), 24 deletions(-)
rename drivers/net/{ => ethernet}/tulip/21142.c (100%)
rename drivers/net/{ => ethernet}/tulip/Kconfig (93%)
rename drivers/net/{ => ethernet}/tulip/Makefile (100%)
rename drivers/net/{ => ethernet}/tulip/de2104x.c (100%)
rename drivers/net/{ => ethernet}/tulip/de4x5.c (100%)
rename drivers/net/{ => ethernet}/tulip/de4x5.h (100%)
rename drivers/net/{ => ethernet}/tulip/dmfe.c (100%)
rename drivers/net/{ => ethernet}/tulip/eeprom.c (100%)
rename drivers/net/{ => ethernet}/tulip/interrupt.c (100%)
rename drivers/net/{ => ethernet}/tulip/media.c (100%)
rename drivers/net/{ => ethernet}/tulip/pnic.c (100%)
rename drivers/net/{ => ethernet}/tulip/pnic2.c (100%)
rename drivers/net/{ => ethernet}/tulip/timer.c (100%)
rename drivers/net/{ => ethernet}/tulip/tulip.h (100%)
rename drivers/net/{ => ethernet}/tulip/tulip_core.c (100%)
rename drivers/net/{ => ethernet}/tulip/uli526x.c (100%)
rename drivers/net/{ => ethernet}/tulip/winbond-840.c (100%)
rename drivers/net/{ => ethernet}/tulip/xircom_cb.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f72a8bd..26d1029 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2040,7 +2040,7 @@ DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
L: netdev@vger.kernel.org
S: Orphan
F: Documentation/networking/dmfe.txt
-F: drivers/net/tulip/dmfe.c
+F: drivers/net/ethernet/tulip/dmfe.c
DC390/AM53C974 SCSI driver
M: Kurt Garloff <garloff@suse.de>
@@ -6278,7 +6278,7 @@ TULIP NETWORK DRIVERS
M: Grant Grundler <grundler@parisc-linux.org>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/tulip/
+F: drivers/net/ethernet/tulip/
TUN/TAP driver
M: Maxim Krasnyansky <maxk@qualcomm.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 71efbe4..0846518 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -481,8 +481,6 @@ config DNET
To compile this driver as a module, choose M here: the module
will be called dnet.
-source "drivers/net/tulip/Kconfig"
-
config AT1700
tristate "AT1700/1720 support (EXPERIMENTAL)"
depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1ac4164..ec07331 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -160,7 +160,6 @@ obj-$(CONFIG_USB_ZD1201) += usb/
obj-$(CONFIG_USB_IPHETH) += usb/
obj-$(CONFIG_WLAN) += wireless/
-obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6fb1625..369f5bb 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -55,4 +55,6 @@ config TEHUTI
---help---
Tehuti Networks 10G Ethernet NIC
+source "drivers/net/ethernet/tulip/Kconfig"
+
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1123a3d..189d112 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -31,3 +31,4 @@ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_TEHUTI) += tehuti.o
+obj-$(CONFIG_NET_TULIP) += tulip/
diff --git a/drivers/net/tulip/21142.c b/drivers/net/ethernet/tulip/21142.c
similarity index 100%
rename from drivers/net/tulip/21142.c
rename to drivers/net/ethernet/tulip/21142.c
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/ethernet/tulip/Kconfig
similarity index 93%
rename from drivers/net/tulip/Kconfig
rename to drivers/net/ethernet/tulip/Kconfig
index 1f8d4a8..c298a08 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/ethernet/tulip/Kconfig
@@ -2,17 +2,15 @@
# Tulip family network device configuration
#
-menuconfig NET_TULIP
- bool "\"Tulip\" family network device support"
+config NET_TULIP
+ bool "\"Tulip\" family network devices"
depends on PCI || EISA || CARDBUS
- help
+ ---help---
This selects the "Tulip" family of EISA/PCI network cards.
-if NET_TULIP
-
config DE2104X
tristate "Early DECchip Tulip (dc2104x) PCI support"
- depends on PCI
+ depends on NET_TULIP && PCI
select CRC32
---help---
This driver is developed for the SMC EtherPower series Ethernet
@@ -32,7 +30,7 @@ config DE2104X_DSL
depends on DE2104X
range 0 31
default 0
- help
+ ---help---
Setting this value allows to align ring buffer descriptors into their
own cache lines. Value of 4 corresponds to the typical 32 byte line
(the descriptor is 16 bytes). This is necessary on systems that lack
@@ -41,7 +39,7 @@ config DE2104X_DSL
config TULIP
tristate "DECchip Tulip (dc2114x) PCI support"
- depends on PCI
+ depends on NET_TULIP && PCI
select CRC32
---help---
This driver is developed for the SMC EtherPower series Ethernet
@@ -59,7 +57,7 @@ config TULIP
config TULIP_MWI
bool "New bus configuration (EXPERIMENTAL)"
depends on TULIP && EXPERIMENTAL
- help
+ ---help---
This configures your Tulip card specifically for the card and
system cache line size type you are using.
@@ -70,7 +68,7 @@ config TULIP_MWI
config TULIP_MMIO
bool "Use PCI shared mem for NIC registers"
depends on TULIP
- help
+ ---help---
Use PCI shared memory for the NIC registers, rather than going through
the Tulip's PIO (programmed I/O ports). Faster, but could produce
obscure bugs if your mainboard has memory controller timing issues.
@@ -79,7 +77,7 @@ config TULIP_MMIO
config TULIP_NAPI
bool "Use RX polling (NAPI)"
depends on TULIP
- help
+ ---help---
NAPI is a new driver API designed to reduce CPU and interrupt load
when the driver is receiving lots of packets from the card. It is
still somewhat experimental and thus not yet enabled by default.
@@ -107,7 +105,7 @@ config TULIP_DM910X
config DE4X5
tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
- depends on PCI || EISA
+ depends on NET_TULIP && (PCI || EISA)
select CRC32
---help---
This is support for the DIGITAL series of PCI/EISA Ethernet cards.
@@ -123,10 +121,10 @@ config DE4X5
config WINBOND_840
tristate "Winbond W89c840 Ethernet support"
- depends on PCI
+ depends on NET_TULIP && PCI
select CRC32
select MII
- help
+ ---help---
This driver is for the Winbond W89c840 chip. It also works with
the TX9882 chip on the Compex RL100-ATX board.
More specific information and updates are available from
@@ -134,7 +132,7 @@ config WINBOND_840
config DM9102
tristate "Davicom DM910x/DM980x support"
- depends on PCI
+ depends on NET_TULIP && PCI
select CRC32
---help---
This driver is for DM9102(A)/DM9132/DM9801 compatible PCI cards from
@@ -147,7 +145,7 @@ config DM9102
config ULI526X
tristate "ULi M526x controller support"
- depends on PCI
+ depends on NET_TULIP && PCI
select CRC32
---help---
This driver is for ULi M5261/M5263 10/100M Ethernet Controller
@@ -158,7 +156,7 @@ config ULI526X
config PCMCIA_XIRCOM
tristate "Xircom CardBus support"
- depends on CARDBUS
+ depends on NET_TULIP && CARDBUS
---help---
This driver is for the Digital "Tulip" Ethernet CardBus adapters.
It should work with most DEC 21*4*-based chips/ethercards, as well
@@ -167,5 +165,3 @@ config PCMCIA_XIRCOM
To compile this driver as a module, choose M here. The module will
be called xircom_cb. If unsure, say N.
-
-endif # NET_TULIP
diff --git a/drivers/net/tulip/Makefile b/drivers/net/ethernet/tulip/Makefile
similarity index 100%
rename from drivers/net/tulip/Makefile
rename to drivers/net/ethernet/tulip/Makefile
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/ethernet/tulip/de2104x.c
similarity index 100%
rename from drivers/net/tulip/de2104x.c
rename to drivers/net/ethernet/tulip/de2104x.c
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/ethernet/tulip/de4x5.c
similarity index 100%
rename from drivers/net/tulip/de4x5.c
rename to drivers/net/ethernet/tulip/de4x5.c
diff --git a/drivers/net/tulip/de4x5.h b/drivers/net/ethernet/tulip/de4x5.h
similarity index 100%
rename from drivers/net/tulip/de4x5.h
rename to drivers/net/ethernet/tulip/de4x5.h
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/ethernet/tulip/dmfe.c
similarity index 100%
rename from drivers/net/tulip/dmfe.c
rename to drivers/net/ethernet/tulip/dmfe.c
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/ethernet/tulip/eeprom.c
similarity index 100%
rename from drivers/net/tulip/eeprom.c
rename to drivers/net/ethernet/tulip/eeprom.c
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/ethernet/tulip/interrupt.c
similarity index 100%
rename from drivers/net/tulip/interrupt.c
rename to drivers/net/ethernet/tulip/interrupt.c
diff --git a/drivers/net/tulip/media.c b/drivers/net/ethernet/tulip/media.c
similarity index 100%
rename from drivers/net/tulip/media.c
rename to drivers/net/ethernet/tulip/media.c
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/ethernet/tulip/pnic.c
similarity index 100%
rename from drivers/net/tulip/pnic.c
rename to drivers/net/ethernet/tulip/pnic.c
diff --git a/drivers/net/tulip/pnic2.c b/drivers/net/ethernet/tulip/pnic2.c
similarity index 100%
rename from drivers/net/tulip/pnic2.c
rename to drivers/net/ethernet/tulip/pnic2.c
diff --git a/drivers/net/tulip/timer.c b/drivers/net/ethernet/tulip/timer.c
similarity index 100%
rename from drivers/net/tulip/timer.c
rename to drivers/net/ethernet/tulip/timer.c
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/ethernet/tulip/tulip.h
similarity index 100%
rename from drivers/net/tulip/tulip.h
rename to drivers/net/ethernet/tulip/tulip.h
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/ethernet/tulip/tulip_core.c
similarity index 100%
rename from drivers/net/tulip/tulip_core.c
rename to drivers/net/ethernet/tulip/tulip_core.c
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/ethernet/tulip/uli526x.c
similarity index 100%
rename from drivers/net/tulip/uli526x.c
rename to drivers/net/ethernet/tulip/uli526x.c
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/ethernet/tulip/winbond-840.c
similarity index 100%
rename from drivers/net/tulip/winbond-840.c
rename to drivers/net/ethernet/tulip/winbond-840.c
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/ethernet/tulip/xircom_cb.c
similarity index 100%
rename from drivers/net/tulip/xircom_cb.c
rename to drivers/net/ethernet/tulip/xircom_cb.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 13/72] be2net: Move the Emulex driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Sathya Perla, Subbu Seetharaman,
Ajit Khaparde
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Moves the Emulex driver into drivers/net/ethernet/emulex/ and
make the necessary Kconfig and Makefile changes.
CC: Sathya Perla <sathya.perla@emulex.com>
CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
CC: Ajit Khaparde <ajit.khaparde@emulex.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
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 | 18 ++++++++++++++++++
drivers/net/ethernet/emulex/Makefile | 5 +++++
drivers/net/ethernet/emulex/benet/Kconfig | 6 ++++++
drivers/net/{ => ethernet/emulex}/benet/Makefile | 0
drivers/net/{ => ethernet/emulex}/benet/be.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_cmds.h | 0
.../net/{ => ethernet/emulex}/benet/be_ethtool.c | 0
drivers/net/{ => ethernet/emulex}/benet/be_hw.h | 0
drivers/net/{ => ethernet/emulex}/benet/be_main.c | 0
16 files changed, 32 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 cc16a52f..5bf6ae2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5655,7 +5655,7 @@ M: Ajit Khaparde <ajit.khaparde@emulex.com>
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 <linux-net-drivers@solarflare.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 51dbdb5..5218303 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1781,8 +1781,6 @@ config BNA
<http://support.brocade.com>
-source "drivers/net/benet/Kconfig"
-
endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b616154..5e1ccb5 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 1a41a49..0000000
--- 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 37819a1..97a4b57 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/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 917131c..bf9b2e9 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_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
diff --git a/drivers/net/ethernet/emulex/Kconfig b/drivers/net/ethernet/emulex/Kconfig
new file mode 100644
index 0000000..f8a68ce
--- /dev/null
+++ b/drivers/net/ethernet/emulex/Kconfig
@@ -0,0 +1,18 @@
+#
+# 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
+ <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 Emulex cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+source "drivers/net/ethernet/emulex/benet/Kconfig"
diff --git a/drivers/net/ethernet/emulex/Makefile b/drivers/net/ethernet/emulex/Makefile
new file mode 100644
index 0000000..ea8ec57
--- /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 0000000..ca2c28e
--- /dev/null
+++ b/drivers/net/ethernet/emulex/benet/Kconfig
@@ -0,0 +1,6 @@
+config BE2NET
+ tristate "ServerEngines' 10Gbps NIC - BladeEngine"
+ depends on NET_VENDOR_EMULEX && 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
--
1.7.5.4
^ permalink raw reply related
* [RFC 18/72] ehea/ibm*: Move the IBM drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, Christoph Raisch, Alfred Arnold,
Santiago Leon, Benjamin Herrenschmidt
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
necessary Kconfig and Makefile changes.
CC: Christoph Raisch <raisch@de.ibm.com>
CC: Alfred Arnold <alfred.arnold@lancom.de>
CC: Santiago Leon <santil@linux.vnet.ibm.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 37 --------------
drivers/net/Makefile | 4 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/ibm/Kconfig | 53 ++++++++++++++++++++
drivers/net/ethernet/ibm/Makefile | 8 +++
drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
.../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
37 files changed, 66 insertions(+), 44 deletions(-)
create mode 100644 drivers/net/ethernet/ibm/Kconfig
create mode 100644 drivers/net/ethernet/ibm/Makefile
rename drivers/net/{ => ethernet/ibm}/ehea/Makefile (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c (100%)
rename drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig (97%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/Makefile (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmlana.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmlana.h (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.c (100%)
rename drivers/net/{ => ethernet/ibm}/ibmveth.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 816c665..0176793 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2432,7 +2432,7 @@ EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
M: Breno Leitao <leitao@linux.vnet.ibm.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ehea/
+F: drivers/net/ethernet/ibm/ehea/
EMBEDDED LINUX
M: Paul Gortmaker <paul.gortmaker@windriver.com>
@@ -3131,7 +3131,7 @@ IBM Power Virtual Ethernet Device Driver
M: Santiago Leon <santil@linux.vnet.ibm.com>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/ibmveth.*
+F: drivers/net/ethernet/ibm/ibmveth.*
IBM ServeRAID RAID DRIVER
P: Jack Hammer
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6294de0..7f28373 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -770,33 +770,6 @@ config SEEQ8005
To compile this driver as a module, choose M here. The module
will be called seeq8005.
-config IBMLANA
- tristate "IBM LAN Adapter/A support"
- depends on MCA
- ---help---
- This is a Micro Channel Ethernet adapter. You need to set
- CONFIG_MCA to use this driver. It is both available as an in-kernel
- driver and as a module.
-
- To compile this driver as a module, choose M here. The only
- currently supported card is the IBM LAN Adapter/A for Ethernet. It
- will both support 16K and 32K memory windows, however a 32K window
- gives a better security against packet losses. Usage of multiple
- boards with this driver should be possible, but has not been tested
- up to now due to lack of hardware.
-
-config IBMVETH
- tristate "IBM LAN Virtual Ethernet support"
- depends on PPC_PSERIES
- ---help---
- This driver supports virtual ethernet adapters on newer IBM iSeries
- and pSeries systems.
-
- To compile this driver as a module, choose M here. The module will
- be called ibmveth.
-
-source "drivers/net/ibm_newemac/Kconfig"
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
@@ -1652,16 +1625,6 @@ if NETDEV_10000
config MDIO
tristate
-config EHEA
- tristate "eHEA Ethernet support"
- depends on IBMEBUS && INET && SPARSEMEM
- select INET_LRO
- ---help---
- This driver supports the IBM pSeries eHEA ethernet adapter.
-
- To compile the driver as a module, choose M here. The module
- will be called ehea.
-
config ENIC
tristate "Cisco VIC Ethernet NIC Support"
depends on PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5241d6e..f0efba2 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -10,9 +10,7 @@ obj-$(CONFIG_TI_DAVINCI_EMAC) += davinci_emac.o
obj-$(CONFIG_TI_DAVINCI_MDIO) += davinci_mdio.o
obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
-obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
obj-$(CONFIG_IP1000) += ipg.o
-obj-$(CONFIG_EHEA) += ehea/
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_ATL1) += atlx/
@@ -127,7 +125,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_SGISEEQ) += sgiseeq.o
obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o
obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_IBMLANA) += ibmlana.o
obj-$(CONFIG_EEXPRESS) += eexpress.o
obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
obj-$(CONFIG_8139CP) += 8139cp.o
@@ -165,7 +162,6 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_SMSC911X) += smsc911x.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index a23ea19..0fd163e 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/neterion/Kconfig"
+source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 690421d..43c912f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
+obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
new file mode 100644
index 0000000..ac755a3
--- /dev/null
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -0,0 +1,53 @@
+#
+# IBM device configuration.
+#
+
+config NET_VENDOR_IBM
+ bool "IBM devices"
+ depends on MCA || PPC_PSERIES || PPC_DCR || IBMEBUS
+ ---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 IBM devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config IBMLANA
+ tristate "IBM LAN Adapter/A support"
+ depends on NET_VENDOR_IBM && MCA
+ ---help---
+ This is a Micro Channel Ethernet adapter. You need to set
+ CONFIG_MCA to use this driver. It is both available as an in-kernel
+ driver and as a module.
+
+ To compile this driver as a module, choose M here. The only
+ currently supported card is the IBM LAN Adapter/A for Ethernet. It
+ will both support 16K and 32K memory windows, however a 32K window
+ gives a better security against packet losses. Usage of multiple
+ boards with this driver should be possible, but has not been tested
+ up to now due to lack of hardware.
+
+config IBMVETH
+ tristate "IBM LAN Virtual Ethernet support"
+ depends on NET_VENDOR_IBM && PPC_PSERIES
+ ---help---
+ This driver supports virtual ethernet adapters on newer IBM iSeries
+ and pSeries systems.
+
+ To compile this driver as a module, choose M here. The module will
+ be called ibmveth.
+
+source "drivers/net/ethernet/ibm/ibm_newemac/Kconfig"
+
+config EHEA
+ tristate "eHEA Ethernet support"
+ depends on NET_VENDOR_IBM && IBMEBUS && INET && SPARSEMEM
+ select INET_LRO
+ ---help---
+ This driver supports the IBM pSeries eHEA ethernet adapter.
+
+ To compile the driver as a module, choose M here. The module
+ will be called ehea.
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
new file mode 100644
index 0000000..a63a8c3
--- /dev/null
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for th IBM network device drivers.
+#
+
+obj-$(CONFIG_IBMLANA) += ibmlana.o
+obj-$(CONFIG_IBMVETH) += ibmveth.o
+obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
+obj-$(CONFIG_EHEA) += ehea/
diff --git a/drivers/net/ehea/Makefile b/drivers/net/ethernet/ibm/ehea/Makefile
similarity index 100%
rename from drivers/net/ehea/Makefile
rename to drivers/net/ethernet/ibm/ehea/Makefile
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
similarity index 100%
rename from drivers/net/ehea/ehea.h
rename to drivers/net/ethernet/ibm/ehea/ehea.h
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
similarity index 100%
rename from drivers/net/ehea/ehea_ethtool.c
rename to drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
diff --git a/drivers/net/ehea/ehea_hw.h b/drivers/net/ethernet/ibm/ehea/ehea_hw.h
similarity index 100%
rename from drivers/net/ehea/ehea_hw.h
rename to drivers/net/ethernet/ibm/ehea/ehea_hw.h
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
similarity index 100%
rename from drivers/net/ehea/ehea_main.c
rename to drivers/net/ethernet/ibm/ehea/ehea_main.c
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
similarity index 100%
rename from drivers/net/ehea/ehea_phyp.c
rename to drivers/net/ethernet/ibm/ehea/ehea_phyp.c
diff --git a/drivers/net/ehea/ehea_phyp.h b/drivers/net/ethernet/ibm/ehea/ehea_phyp.h
similarity index 100%
rename from drivers/net/ehea/ehea_phyp.h
rename to drivers/net/ethernet/ibm/ehea/ehea_phyp.h
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
similarity index 100%
rename from drivers/net/ehea/ehea_qmr.c
rename to drivers/net/ethernet/ibm/ehea/ehea_qmr.c
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ethernet/ibm/ehea/ehea_qmr.h
similarity index 100%
rename from drivers/net/ehea/ehea_qmr.h
rename to drivers/net/ethernet/ibm/ehea/ehea_qmr.h
diff --git a/drivers/net/ibm_newemac/Kconfig b/drivers/net/ethernet/ibm/ibm_newemac/Kconfig
similarity index 97%
rename from drivers/net/ibm_newemac/Kconfig
rename to drivers/net/ethernet/ibm/ibm_newemac/Kconfig
index 78a1628..7e370b0 100644
--- a/drivers/net/ibm_newemac/Kconfig
+++ b/drivers/net/ethernet/ibm/ibm_newemac/Kconfig
@@ -1,6 +1,6 @@
config IBM_NEW_EMAC
tristate "IBM EMAC Ethernet support"
- depends on PPC_DCR
+ depends on NET_VENDOR_IBM && PPC_DCR
select CRC32
help
This driver supports the IBM EMAC family of Ethernet controllers
diff --git a/drivers/net/ibm_newemac/Makefile b/drivers/net/ethernet/ibm/ibm_newemac/Makefile
similarity index 100%
rename from drivers/net/ibm_newemac/Makefile
rename to drivers/net/ethernet/ibm/ibm_newemac/Makefile
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ethernet/ibm/ibm_newemac/core.c
similarity index 100%
rename from drivers/net/ibm_newemac/core.c
rename to drivers/net/ethernet/ibm/ibm_newemac/core.c
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ethernet/ibm/ibm_newemac/core.h
similarity index 100%
rename from drivers/net/ibm_newemac/core.h
rename to drivers/net/ethernet/ibm/ibm_newemac/core.h
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ethernet/ibm/ibm_newemac/debug.c
similarity index 100%
rename from drivers/net/ibm_newemac/debug.c
rename to drivers/net/ethernet/ibm/ibm_newemac/debug.c
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ethernet/ibm/ibm_newemac/debug.h
similarity index 100%
rename from drivers/net/ibm_newemac/debug.h
rename to drivers/net/ethernet/ibm/ibm_newemac/debug.h
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ethernet/ibm/ibm_newemac/emac.h
similarity index 100%
rename from drivers/net/ibm_newemac/emac.h
rename to drivers/net/ethernet/ibm/ibm_newemac/emac.h
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ethernet/ibm/ibm_newemac/mal.c
similarity index 100%
rename from drivers/net/ibm_newemac/mal.c
rename to drivers/net/ethernet/ibm/ibm_newemac/mal.c
diff --git a/drivers/net/ibm_newemac/mal.h b/drivers/net/ethernet/ibm/ibm_newemac/mal.h
similarity index 100%
rename from drivers/net/ibm_newemac/mal.h
rename to drivers/net/ethernet/ibm/ibm_newemac/mal.h
diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ethernet/ibm/ibm_newemac/phy.c
similarity index 100%
rename from drivers/net/ibm_newemac/phy.c
rename to drivers/net/ethernet/ibm/ibm_newemac/phy.c
diff --git a/drivers/net/ibm_newemac/phy.h b/drivers/net/ethernet/ibm/ibm_newemac/phy.h
similarity index 100%
rename from drivers/net/ibm_newemac/phy.h
rename to drivers/net/ethernet/ibm/ibm_newemac/phy.h
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ethernet/ibm/ibm_newemac/rgmii.c
similarity index 100%
rename from drivers/net/ibm_newemac/rgmii.c
rename to drivers/net/ethernet/ibm/ibm_newemac/rgmii.c
diff --git a/drivers/net/ibm_newemac/rgmii.h b/drivers/net/ethernet/ibm/ibm_newemac/rgmii.h
similarity index 100%
rename from drivers/net/ibm_newemac/rgmii.h
rename to drivers/net/ethernet/ibm/ibm_newemac/rgmii.h
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ethernet/ibm/ibm_newemac/tah.c
similarity index 100%
rename from drivers/net/ibm_newemac/tah.c
rename to drivers/net/ethernet/ibm/ibm_newemac/tah.c
diff --git a/drivers/net/ibm_newemac/tah.h b/drivers/net/ethernet/ibm/ibm_newemac/tah.h
similarity index 100%
rename from drivers/net/ibm_newemac/tah.h
rename to drivers/net/ethernet/ibm/ibm_newemac/tah.h
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ethernet/ibm/ibm_newemac/zmii.c
similarity index 100%
rename from drivers/net/ibm_newemac/zmii.c
rename to drivers/net/ethernet/ibm/ibm_newemac/zmii.c
diff --git a/drivers/net/ibm_newemac/zmii.h b/drivers/net/ethernet/ibm/ibm_newemac/zmii.h
similarity index 100%
rename from drivers/net/ibm_newemac/zmii.h
rename to drivers/net/ethernet/ibm/ibm_newemac/zmii.h
diff --git a/drivers/net/ibmlana.c b/drivers/net/ethernet/ibm/ibmlana.c
similarity index 100%
rename from drivers/net/ibmlana.c
rename to drivers/net/ethernet/ibm/ibmlana.c
diff --git a/drivers/net/ibmlana.h b/drivers/net/ethernet/ibm/ibmlana.h
similarity index 100%
rename from drivers/net/ibmlana.h
rename to drivers/net/ethernet/ibm/ibmlana.h
diff --git a/drivers/net/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
similarity index 100%
rename from drivers/net/ibmveth.c
rename to drivers/net/ethernet/ibm/ibmveth.c
diff --git a/drivers/net/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h
similarity index 100%
rename from drivers/net/ibmveth.h
rename to drivers/net/ethernet/ibm/ibmveth.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 37/72] fsl_*/gianfar*/ucc_*: Move the Freescale drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, Sandeep Gopalpet, Andy Fleming,
Shlomi Gridish, Li Yang, Pantelis Antoniou, Vitaly Bordug
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Freescale driver into drivers/net/ethernet/freescale/ and
make the necessary Kconfig and Makefile changes.
CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
CC: Andy Fleming <afleming@freescale.com>
CC: Shlomi Gridish <gridish@freescale.com>
CC: Li Yang <leoli@freescale.com>
CC: Pantelis Antoniou <pantelis.antoniou@gmail.com>
CC: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 33 -------------
drivers/net/Makefile | 14 ------
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/freescale/Kconfig | 48 ++++++++++++++++++++
drivers/net/ethernet/freescale/Makefile | 13 +++++
.../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
.../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
.../freescale}/fs_enet/fs_enet-main.c | 0
.../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
.../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
.../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
.../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
.../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
.../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
drivers/net/{ => ethernet/freescale}/gianfar.c | 0
drivers/net/{ => ethernet/freescale}/gianfar.h | 0
.../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
.../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
.../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
27 files changed, 66 insertions(+), 50 deletions(-)
create mode 100644 drivers/net/ethernet/freescale/Kconfig
create mode 100644 drivers/net/ethernet/freescale/Makefile
rename drivers/net/{ => ethernet/freescale}/fs_enet/Kconfig (91%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/Makefile (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/fec.h (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet-main.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/fs_enet.h (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fcc.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-fec.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mac-scc.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-bitbang.c (100%)
rename drivers/net/{ => ethernet/freescale}/fs_enet/mii-fec.c (100%)
rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c (100%)
rename drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar.c (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar.h (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar_ethtool.c (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar_ptp.c (100%)
rename drivers/net/{ => ethernet/freescale}/gianfar_sysfs.c (100%)
rename drivers/net/{ => ethernet/freescale}/ucc_geth.c (100%)
rename drivers/net/{ => ethernet/freescale}/ucc_geth.h (100%)
rename drivers/net/{ => ethernet/freescale}/ucc_geth_ethtool.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 160ce2f..bbb609b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2656,7 +2656,7 @@ M: Vitaly Bordug <vbordug@ru.mvista.com>
L: linuxppc-dev@lists.ozlabs.org
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/fs_enet/
+F: drivers/net/ethernet/freescale/fs_enet/
F: include/linux/fs_enet_pd.h
FREESCALE QUICC ENGINE LIBRARY
@@ -2678,7 +2678,7 @@ M: Li Yang <leoli@freescale.com>
L: netdev@vger.kernel.org
L: linuxppc-dev@lists.ozlabs.org
S: Maintained
-F: drivers/net/ucc_geth*
+F: drivers/net/ethernet/freescale/ucc_geth*
FREESCALE QUICC ENGINE UCC UART DRIVER
M: Timur Tabi <timur@freescale.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index e352432..71efe31 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -765,9 +765,6 @@ config LANTIQ_ETOP
help
Support for the MII0 inside the Lantiq SoC
-
-source "drivers/net/fs_enet/Kconfig"
-
source "drivers/net/octeon/Kconfig"
endif # NET_ETHERNET
@@ -884,36 +881,6 @@ config GELIC_WIRELESS
the driver automatically distinguishes the models, you can
safely enable this option even if you have a wireless-less model.
-config FSL_PQ_MDIO
- tristate "Freescale PQ MDIO"
- depends on FSL_SOC
- select PHYLIB
- help
- This driver supports the MDIO bus used by the gianfar and UCC drivers.
-
-config GIANFAR
- tristate "Gianfar Ethernet"
- depends on FSL_SOC
- select FSL_PQ_MDIO
- select PHYLIB
- select CRC32
- help
- This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
- and MPC86xx family of chips, and the FEC on the 8540.
-
-config UCC_GETH
- tristate "Freescale QE Gigabit Ethernet"
- depends on QUICC_ENGINE
- select FSL_PQ_MDIO
- select PHYLIB
- help
- This driver supports the Gigabit Ethernet mode of the QUICC Engine,
- which is available on some Freescale SOCs.
-
-config UGETH_TX_ON_DEMAND
- bool "Transmit on Demand support"
- depends on UCC_GETH
-
config MV643XX_ETH
tristate "Marvell Discovery (643XX) and Orion ethernet support"
depends on (MV64X60 || PPC32 || PLAT_ORION) && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index eee3091..0b1c240 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -5,24 +5,12 @@
obj-$(CONFIG_MII) += mii.o
obj-$(CONFIG_MDIO) += mdio.o
obj-$(CONFIG_PHYLIB) += phy/
-
obj-$(CONFIG_IP1000) += ipg.o
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_GIANFAR) += gianfar_driver.o
-obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
-gianfar_driver-objs := gianfar.o \
- gianfar_ethtool.o \
- gianfar_sysfs.o
-
-obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
-ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
-
-obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
-
#
# link order important here
#
@@ -150,8 +138,6 @@ obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
obj-$(CONFIG_NETCONSOLE) += netconsole.o
-obj-$(CONFIG_FS_ENET) += fs_enet/
-
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_WIMAX) += wimax/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c584ba7..8654b69 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,7 @@ source "drivers/net/ethernet/dlink/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/neterion/Kconfig"
source "drivers/net/ethernet/faraday/Kconfig"
+source "drivers/net/ethernet/freescale/Kconfig"
source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 1d8dba7..a09193f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
+obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
diff --git a/drivers/net/ethernet/freescale/Kconfig b/drivers/net/ethernet/freescale/Kconfig
new file mode 100644
index 0000000..192286e
--- /dev/null
+++ b/drivers/net/ethernet/freescale/Kconfig
@@ -0,0 +1,48 @@
+#
+# Freescale device configuration
+#
+
+config NET_VENDOR_FEESCALE
+ bool "Freescale devices"
+ depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x
+ ---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 IBM devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+source "drivers/net/ethernet/freescale/fs_enet/Kconfig"
+
+config FSL_PQ_MDIO
+ tristate "Freescale PQ MDIO"
+ depends on NET_VENDOR_FREESCALE && FSL_SOC
+ select PHYLIB
+ ---help---
+ This driver supports the MDIO bus used by the gianfar and UCC drivers.
+
+config UCC_GETH
+ tristate "Freescale QE Gigabit Ethernet"
+ depends on NET_VENDOR_FREESCALE && QUICC_ENGINE
+ select FSL_PQ_MDIO
+ select PHYLIB
+ ---help---
+ This driver supports the Gigabit Ethernet mode of the QUICC Engine,
+ which is available on some Freescale SOCs.
+
+config UGETH_TX_ON_DEMAND
+ bool "Transmit on Demand support"
+ depends on UCC_GETH
+
+config GIANFAR
+ tristate "Gianfar Ethernet"
+ depends on NET_VENDOR_FREESCALE && FSL_SOC
+ select FSL_PQ_MDIO
+ select PHYLIB
+ select CRC32
+ ---help---
+ This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
+ and MPC86xx family of chips, and the FEC on the 8540.
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
new file mode 100644
index 0000000..7f7fae9
--- /dev/null
+++ b/drivers/net/ethernet/freescale/Makefile
@@ -0,0 +1,13 @@
+#
+# Makefile for the Freescale network device drivers.
+#
+
+obj-$(CONFIG_FS_ENET) += fs_enet/
+obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
+obj-$(CONFIG_GIANFAR) += gianfar_driver.o
+obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
+gianfar_driver-objs := gianfar.o \
+ gianfar_ethtool.o \
+ gianfar_sysfs.o
+obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
+ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/ethernet/freescale/fs_enet/Kconfig
similarity index 91%
rename from drivers/net/fs_enet/Kconfig
rename to drivers/net/ethernet/freescale/fs_enet/Kconfig
index fc073b5..be92229 100644
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/ethernet/freescale/fs_enet/Kconfig
@@ -1,6 +1,6 @@
config FS_ENET
tristate "Freescale Ethernet Driver"
- depends on CPM1 || CPM2 || PPC_MPC512x
+ depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x)
select MII
select PHYLIB
diff --git a/drivers/net/fs_enet/Makefile b/drivers/net/ethernet/freescale/fs_enet/Makefile
similarity index 100%
rename from drivers/net/fs_enet/Makefile
rename to drivers/net/ethernet/freescale/fs_enet/Makefile
diff --git a/drivers/net/fs_enet/fec.h b/drivers/net/ethernet/freescale/fs_enet/fec.h
similarity index 100%
rename from drivers/net/fs_enet/fec.h
rename to drivers/net/ethernet/freescale/fs_enet/fec.h
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
similarity index 100%
rename from drivers/net/fs_enet/fs_enet-main.c
rename to drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/ethernet/freescale/fs_enet/fs_enet.h
similarity index 100%
rename from drivers/net/fs_enet/fs_enet.h
rename to drivers/net/ethernet/freescale/fs_enet/fs_enet.h
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
similarity index 100%
rename from drivers/net/fs_enet/mac-fcc.c
rename to drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
similarity index 100%
rename from drivers/net/fs_enet/mac-fec.c
rename to drivers/net/ethernet/freescale/fs_enet/mac-fec.c
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
similarity index 100%
rename from drivers/net/fs_enet/mac-scc.c
rename to drivers/net/ethernet/freescale/fs_enet/mac-scc.c
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
similarity index 100%
rename from drivers/net/fs_enet/mii-bitbang.c
rename to drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
similarity index 100%
rename from drivers/net/fs_enet/mii-fec.c
rename to drivers/net/ethernet/freescale/fs_enet/mii-fec.c
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
similarity index 100%
rename from drivers/net/fsl_pq_mdio.c
rename to drivers/net/ethernet/freescale/fsl_pq_mdio.c
diff --git a/drivers/net/fsl_pq_mdio.h b/drivers/net/ethernet/freescale/fsl_pq_mdio.h
similarity index 100%
rename from drivers/net/fsl_pq_mdio.h
rename to drivers/net/ethernet/freescale/fsl_pq_mdio.h
diff --git a/drivers/net/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
similarity index 100%
rename from drivers/net/gianfar.c
rename to drivers/net/ethernet/freescale/gianfar.c
diff --git a/drivers/net/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h
similarity index 100%
rename from drivers/net/gianfar.h
rename to drivers/net/ethernet/freescale/gianfar.h
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c
similarity index 100%
rename from drivers/net/gianfar_ethtool.c
rename to drivers/net/ethernet/freescale/gianfar_ethtool.c
diff --git a/drivers/net/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
similarity index 100%
rename from drivers/net/gianfar_ptp.c
rename to drivers/net/ethernet/freescale/gianfar_ptp.c
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/ethernet/freescale/gianfar_sysfs.c
similarity index 100%
rename from drivers/net/gianfar_sysfs.c
rename to drivers/net/ethernet/freescale/gianfar_sysfs.c
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
similarity index 100%
rename from drivers/net/ucc_geth.c
rename to drivers/net/ethernet/freescale/ucc_geth.c
diff --git a/drivers/net/ucc_geth.h b/drivers/net/ethernet/freescale/ucc_geth.h
similarity index 100%
rename from drivers/net/ucc_geth.h
rename to drivers/net/ethernet/freescale/ucc_geth.h
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ethernet/freescale/ucc_geth_ethtool.c
similarity index 100%
rename from drivers/net/ucc_geth_ethtool.c
rename to drivers/net/ethernet/freescale/ucc_geth_ethtool.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 16/72] myri*: Move the Myricom drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Andrew Gallatin, Brice Goglin
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
the necessary Kconfig and Makefile changes.
CC: Andrew Gallatin <gallatin@myri.com>
CC: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 26 ------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/myricom/Kconfig | 42 ++++++++++++++++++++
drivers/net/ethernet/myricom/Makefile | 5 ++
.../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
.../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
.../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
| 0
11 files changed, 50 insertions(+), 28 deletions(-)
create mode 100644 drivers/net/ethernet/myricom/Kconfig
create mode 100644 drivers/net/ethernet/myricom/Makefile
rename drivers/net/{ => ethernet/myricom}/myri10ge/Makefile (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge.c (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h (100%)
rename drivers/net/{ => ethernet/myricom}/myri10ge/myri10ge_mcp_gen_header.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b73e10b..81dfcff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4276,7 +4276,7 @@ M: Brice Goglin <brice@myri.com>
L: netdev@vger.kernel.org
W: http://www.myri.com/scs/download-Myri10GE.html
S: Supported
-F: drivers/net/myri10ge/
+F: drivers/net/ethernet/myricom/myri10ge/
NATSEMI ETHERNET DRIVER (DP8381x)
M: Tim Hockin <thockin@hockin.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4e8b6c3..6b58ee3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1702,32 +1702,6 @@ config VXGE_DEBUG_TRACE_ALL
the vxge driver. By default only few debug trace statements are
enabled.
-config MYRI10GE
- tristate "Myricom Myri-10G Ethernet support"
- depends on PCI && INET
- select FW_LOADER
- select CRC32
- select INET_LRO
- ---help---
- This driver supports Myricom Myri-10G Dual Protocol interface in
- Ethernet mode. If the eeprom on your board is not recent enough,
- you will need a newer firmware image.
- You may get this image or more information, at:
-
- <http://www.myri.com/scs/download-Myri10GE.html>
-
- To compile this driver as a module, choose M here. The module
- will be called myri10ge.
-
-config MYRI10GE_DCA
- bool "Direct Cache Access (DCA) Support"
- default y
- depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
- ---help---
- Say Y here if you want to use Direct Cache Access (DCA) in the
- driver. DCA is a method for warming the CPU cache before data
- is used, with the intent of lessening the impact of cache misses.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6c2eb60..15c3598 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -168,7 +168,6 @@ obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_S2IO) += s2io.o
obj-$(CONFIG_VXGE) += vxge/
-obj-$(CONFIG_MYRI10GE) += myri10ge/
obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_SMSC911X) += smsc911x.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 67b06b2..6149413 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -20,6 +20,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
+source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ecbe7fa..093b44f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -11,6 +11,7 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
+obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/myricom/Kconfig b/drivers/net/ethernet/myricom/Kconfig
new file mode 100644
index 0000000..1227005
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Kconfig
@@ -0,0 +1,42 @@
+#
+# Myricom device configuration
+#
+
+config NET_VENDOR_MYRI
+ bool "Myricom network 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
+ <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 Myricom cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config MYRI10GE
+ tristate "Myricom Myri-10G Ethernet support"
+ depends on NET_VENDOR_MYRI && PCI && INET
+ select FW_LOADER
+ select CRC32
+ select INET_LRO
+ ---help---
+ This driver supports Myricom Myri-10G Dual Protocol interface in
+ Ethernet mode. If the eeprom on your board is not recent enough,
+ you will need a newer firmware image.
+ You may get this image or more information, at:
+
+ <http://www.myri.com/scs/download-Myri10GE.html>
+
+ To compile this driver as a module, choose M here. The module
+ will be called myri10ge.
+
+config MYRI10GE_DCA
+ bool "Direct Cache Access (DCA) Support"
+ default y
+ depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m)
+ ---help---
+ Say Y here if you want to use Direct Cache Access (DCA) in the
+ driver. DCA is a method for warming the CPU cache before data
+ is used, with the intent of lessening the impact of cache misses.
diff --git a/drivers/net/ethernet/myricom/Makefile b/drivers/net/ethernet/myricom/Makefile
new file mode 100644
index 0000000..296c0a1
--- /dev/null
+++ b/drivers/net/ethernet/myricom/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Myricom network device drivers.
+#
+
+obj-$(CONFIG_MYRI10GE) += myri10ge/
diff --git a/drivers/net/myri10ge/Makefile b/drivers/net/ethernet/myricom/myri10ge/Makefile
similarity index 100%
rename from drivers/net/myri10ge/Makefile
rename to drivers/net/ethernet/myricom/myri10ge/Makefile
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
similarity index 100%
rename from drivers/net/myri10ge/myri10ge.c
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge.c
diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp.h
diff --git a/drivers/net/myri10ge/myri10ge_mcp_gen_header.h b/drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
similarity index 100%
rename from drivers/net/myri10ge/myri10ge_mcp_gen_header.h
rename to drivers/net/ethernet/myricom/myri10ge/myri10ge_mcp_gen_header.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 40/72] spider_net: Move the spider_net (IBM) driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Utz Bacher, Jens Osterkamp, Ishizaki Kou
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
make the necessary Kconfig and Makefile changes
CC: Utz Bacher <utz.bacher@de.ibm.com>
CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 8 --------
drivers/net/Makefile | 2 --
drivers/net/ethernet/ibm/Kconfig | 11 ++++++++++-
drivers/net/ethernet/ibm/Makefile | 2 ++
drivers/net/{ => ethernet/ibm}/spider_net.c | 0
drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
.../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
8 files changed, 14 insertions(+), 13 deletions(-)
rename drivers/net/{ => ethernet/ibm}/spider_net.c (100%)
rename drivers/net/{ => ethernet/ibm}/spider_net.h (99%)
rename drivers/net/{ => ethernet/ibm}/spider_net_ethtool.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 27bb4a2..7fa33bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5992,7 +5992,7 @@ M: Jens Osterkamp <jens@de.ibm.com>
L: netdev@vger.kernel.org
S: Supported
F: Documentation/networking/spider_net.txt
-F: drivers/net/spider_net*
+F: drivers/net/ethernet/ibm/spider_net*
SPU FILE SYSTEM
M: Jeremy Kerr <jk@ozlabs.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4bfd5e3..b8894ad 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -797,14 +797,6 @@ config SIS190
To compile this driver as a module, choose M here: the module
will be called sis190. This is recommended.
-config SPIDER_NET
- tristate "Spider Gigabit Ethernet driver"
- depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
- select FW_LOADER
- help
- This driver supports the Gigabit Ethernet chips present on the
- Cell Processor-Based Blades from IBM.
-
config TSI108_ETH
tristate "Tundra TSI108 gigabit Ethernet support"
depends on TSI108_BRIDGE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3aca65c..fe9b44c 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -25,8 +25,6 @@ obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_FEALNX) += fealnx.o
-spidernet-y += spider_net.o spider_net_ethtool.o
-obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
diff --git a/drivers/net/ethernet/ibm/Kconfig b/drivers/net/ethernet/ibm/Kconfig
index ac755a3..54fcdcb 100644
--- a/drivers/net/ethernet/ibm/Kconfig
+++ b/drivers/net/ethernet/ibm/Kconfig
@@ -4,7 +4,8 @@
config NET_VENDOR_IBM
bool "IBM devices"
- depends on MCA || PPC_PSERIES || PPC_DCR || IBMEBUS
+ depends on MCA || PPC_PSERIES || PPC_DCR || IBMEBUS || (PCI && \
+ (PPC_IBM_CELL_BLADE || PPC_CELLEB))
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -51,3 +52,11 @@ config EHEA
To compile the driver as a module, choose M here. The module
will be called ehea.
+
+config SPIDER_NET
+ tristate "Spider Gigabit Ethernet driver"
+ depends on NET_VENDOR_IBM && PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB)
+ select FW_LOADER
+ ---help---
+ This driver supports the Gigabit Ethernet chips present on the
+ Cell Processor-Based Blades from IBM.
diff --git a/drivers/net/ethernet/ibm/Makefile b/drivers/net/ethernet/ibm/Makefile
index a63a8c3..76c1646 100644
--- a/drivers/net/ethernet/ibm/Makefile
+++ b/drivers/net/ethernet/ibm/Makefile
@@ -6,3 +6,5 @@ obj-$(CONFIG_IBMLANA) += ibmlana.o
obj-$(CONFIG_IBMVETH) += ibmveth.o
obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/
obj-$(CONFIG_EHEA) += ehea/
+spidernet-y += spider_net.o spider_net_ethtool.o
+obj-$(CONFIG_SPIDER_NET) += spidernet.o ../sun/sungem_phy.o
diff --git a/drivers/net/spider_net.c b/drivers/net/ethernet/ibm/spider_net.c
similarity index 100%
rename from drivers/net/spider_net.c
rename to drivers/net/ethernet/ibm/spider_net.c
diff --git a/drivers/net/spider_net.h b/drivers/net/ethernet/ibm/spider_net.h
similarity index 99%
rename from drivers/net/spider_net.h
rename to drivers/net/ethernet/ibm/spider_net.h
index a891ad0..9bfce7c 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/ethernet/ibm/spider_net.h
@@ -27,7 +27,7 @@
#define VERSION "2.0 B"
-#include "./ethernet/sun/sungem_phy.h"
+#include "../sun/sungem_phy.h"
extern int spider_net_stop(struct net_device *netdev);
extern int spider_net_open(struct net_device *netdev);
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/ethernet/ibm/spider_net_ethtool.c
similarity index 100%
rename from drivers/net/spider_net_ethtool.c
rename to drivers/net/ethernet/ibm/spider_net_ethtool.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 41/72] sis*: Move the Silicon Integrated Systems (SiS) drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Daniele Venzano, Francois Romieu
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the SiS drivers into drivers/net/ethernet/sis/ and make the
necessary Kconfig and Makefile changes
CC: Daniele Venzano <venza@brownhat.org>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 30 --------------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/sis/Kconfig | 46 +++++++++++++++++++++++++++++++
drivers/net/ethernet/sis/Makefile | 6 ++++
drivers/net/{ => ethernet/sis}/sis190.c | 0
drivers/net/{ => ethernet/sis}/sis900.c | 0
drivers/net/{ => ethernet/sis}/sis900.h | 0
10 files changed, 56 insertions(+), 34 deletions(-)
create mode 100644 drivers/net/ethernet/sis/Kconfig
create mode 100644 drivers/net/ethernet/sis/Makefile
rename drivers/net/{ => ethernet/sis}/sis190.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.c (100%)
rename drivers/net/{ => ethernet/sis}/sis900.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7fa33bd..fa2f1bb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5728,14 +5728,14 @@ SIS 190 ETHERNET DRIVER
M: Francois Romieu <romieu@fr.zoreil.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/sis190.c
+F: drivers/net/ethernet/sis/sis190.c
SIS 900/7016 FAST ETHERNET DRIVER
M: Daniele Venzano <venza@brownhat.org>
W: http://www.brownhat.org/sis900.html
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/sis900.*
+F: drivers/net/ethernet/sis/sis900.*
SIS 96X I2C/SMBUS DRIVER
M: "Mark M. Hoffman" <mhoffman@lightlink.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b8894ad..37e06ae 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -570,22 +570,6 @@ config R6040
To compile this driver as a module, choose M here: the module
will be called r6040. This is recommended.
-config SIS900
- tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
- depends on NET_PCI && PCI
- select CRC32
- select MII
- ---help---
- This is a driver for the Fast Ethernet PCI network cards based on
- the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
- SiS 630 and SiS 540 chipsets.
-
- This driver also supports AMD 79C901 HomePNA so that you can use
- your phone line as a network cable.
-
- To compile this driver as a module, choose M here: the module
- will be called sis900. This is recommended.
-
config SUNDANCE
tristate "Sundance Alta support"
depends on NET_PCI && PCI
@@ -783,20 +767,6 @@ config YELLOWFIN
To compile this driver as a module, choose M here: the module
will be called yellowfin. This is recommended.
-config SIS190
- tristate "SiS190/SiS191 gigabit ethernet support"
- depends on PCI
- select CRC32
- select MII
- ---help---
- Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
- a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
- appear in lan on motherboard designs which are based on SiS 965
- and SiS 966 south bridge.
-
- To compile this driver as a module, choose M here: the module
- will be called sis190. This is recommended.
-
config TSI108_ETH
tristate "Tundra TSI108 gigabit Ethernet support"
depends on TSI108_BRIDGE
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index fe9b44c..d1724fa 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,8 +19,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_SIS190) += sis190.o
-obj-$(CONFIG_SIS900) += sis900.o
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9b5eca3..276a19d 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -48,6 +48,7 @@ config PASEMI_MAC
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
+source "drivers/net/ethernet/sis/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/sgi/Kconfig"
source "drivers/net/ethernet/smc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 23ebc6e..dd94351 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -30,6 +30,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_NET_VENDOR_SIS) += sis/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
obj-$(CONFIG_NET_VENDOR_SMC) += smc/
diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig
new file mode 100644
index 0000000..cf40fe6
--- /dev/null
+++ b/drivers/net/ethernet/sis/Kconfig
@@ -0,0 +1,46 @@
+#
+# Silicon Integrated Systems (SiS) device configuration
+#
+
+config NET_VENDOR_SIS
+ bool "Silicon Integrated Systems (SiS) 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 SiS devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config SIS900
+ tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
+ depends on NET_VENDOR_SIS && PCI
+ select CRC32
+ select MII
+ ---help---
+ This is a driver for the Fast Ethernet PCI network cards based on
+ the SiS 900 and SiS 7016 chips. The SiS 900 core is also embedded in
+ SiS 630 and SiS 540 chipsets.
+
+ This driver also supports AMD 79C901 HomePNA so that you can use
+ your phone line as a network cable.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sis900. This is recommended.
+
+config SIS190
+ tristate "SiS190/SiS191 gigabit ethernet support"
+ depends on NET_VENDOR_SIS && PCI
+ select CRC32
+ select MII
+ ---help---
+ Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
+ a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to
+ appear in lan on motherboard designs which are based on SiS 965
+ and SiS 966 south bridge.
+
+ To compile this driver as a module, choose M here: the module
+ will be called sis190. This is recommended.
diff --git a/drivers/net/ethernet/sis/Makefile b/drivers/net/ethernet/sis/Makefile
new file mode 100644
index 0000000..58d3ac1
--- /dev/null
+++ b/drivers/net/ethernet/sis/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for Silicon Integrated Systems (SiS) network device drivers.
+#
+
+obj-$(CONFIG_SIS190) += sis190.o
+obj-$(CONFIG_SIS900) += sis900.o
diff --git a/drivers/net/sis190.c b/drivers/net/ethernet/sis/sis190.c
similarity index 100%
rename from drivers/net/sis190.c
rename to drivers/net/ethernet/sis/sis190.c
diff --git a/drivers/net/sis900.c b/drivers/net/ethernet/sis/sis900.c
similarity index 100%
rename from drivers/net/sis900.c
rename to drivers/net/ethernet/sis/sis900.c
diff --git a/drivers/net/sis900.h b/drivers/net/ethernet/sis/sis900.h
similarity index 100%
rename from drivers/net/sis900.h
rename to drivers/net/ethernet/sis/sis900.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 38/72] ks8*/ksz8*: Move the Micrel drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Ben Dooks, Tristram Ha
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Micrel drivers into drivers/net/ethernet/micrel/ and
make the necessary Kconfig and Makefile changes.
CC: Ben Dooks <ben@simtec.co.uk>
CC: Tristram Ha <Tristram.Ha@micrel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 35 ----------------
drivers/net/Makefile | 4 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/micrel/Kconfig | 51 ++++++++++++++++++++++++
drivers/net/ethernet/micrel/Makefile | 8 ++++
drivers/net/{ => ethernet/micrel}/ks8842.c | 0
drivers/net/{ => ethernet/micrel}/ks8851.c | 0
drivers/net/{ => ethernet/micrel}/ks8851.h | 0
drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
11 files changed, 61 insertions(+), 39 deletions(-)
create mode 100644 drivers/net/ethernet/micrel/Kconfig
create mode 100644 drivers/net/ethernet/micrel/Makefile
rename drivers/net/{ => ethernet/micrel}/ks8842.c (100%)
rename drivers/net/{ => ethernet/micrel}/ks8851.c (100%)
rename drivers/net/{ => ethernet/micrel}/ks8851.h (100%)
rename drivers/net/{ => ethernet/micrel}/ks8851_mll.c (100%)
rename drivers/net/{ => ethernet/micrel}/ksz884x.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 71efe31..be261ec 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -531,17 +531,6 @@ config ADAPTEC_STARFIRE
To compile this driver as a module, choose M here: the module
will be called starfire. This is recommended.
-config KSZ884X_PCI
- tristate "Micrel KSZ8841/2 PCI"
- depends on NET_PCI && PCI
- select MII
- select CRC32
- help
- This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
-
- To compile this driver as a module, choose M here. The module
- will be called ksz884x.
-
config APRICOT
tristate "Apricot Xen-II on board Ethernet"
depends on NET_PCI && ISA
@@ -645,30 +634,6 @@ config TLAN
Please email feedback to <torben.mathiasen@compaq.com>.
-config KS8842
- tristate "Micrel KSZ8841/42 with generic bus interface"
- depends on HAS_IOMEM && DMA_ENGINE
- help
- This platform driver is for KSZ8841(1-port) / KS8842(2-port)
- ethernet switch chip (managed, VLAN, QoS) from Micrel or
- Timberdale(FPGA).
-
-config KS8851
- tristate "Micrel KS8851 SPI"
- depends on SPI
- select MII
- select CRC32
- help
- SPI driver for Micrel KS8851 SPI attached network chip.
-
-config KS8851_MLL
- tristate "Micrel KS8851 MLL"
- depends on HAS_IOMEM
- select MII
- help
- This platform driver is for Micrel KS8851 Address/data bus
- multiplexed network chip.
-
config SC92031
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
depends on NET_PCI && PCI && EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0b1c240..c68cdea 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -32,10 +32,6 @@ gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)
obj-$(CONFIG_TC35815) += tc35815.o
obj-$(CONFIG_SKFP) += skfp/
-obj-$(CONFIG_KS8842) += ks8842.o
-obj-$(CONFIG_KS8851) += ks8851.o
-obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
-obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_SH_ETH) += sh_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8654b69..f434fc8 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -28,6 +28,7 @@ source "drivers/net/ethernet/freescale/Kconfig"
source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
+source "drivers/net/ethernet/micrel/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a09193f..3a9f47d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
+obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_NET_ISA) += isa/
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
new file mode 100644
index 0000000..c315bff
--- /dev/null
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -0,0 +1,51 @@
+#
+# Micrel device configuration
+#
+
+config NET_VENDOR_MICREL
+ bool "Micrel devices"
+ depends on HAS_IOMEM || DMA_ENGINE || SPI || 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 Micrel devices. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+config KS8842
+ tristate "Micrel KSZ8841/42 with generic bus interface"
+ depends on NET_VENDOR_MICREL && HAS_IOMEM && DMA_ENGINE
+ ---help---
+ This platform driver is for KSZ8841(1-port) / KS8842(2-port)
+ ethernet switch chip (managed, VLAN, QoS) from Micrel or
+ Timberdale(FPGA).
+
+config KS8851
+ tristate "Micrel KS8851 SPI"
+ depends on NET_VENDOR_MICREL && SPI
+ select MII
+ select CRC32
+ ---help---
+ SPI driver for Micrel KS8851 SPI attached network chip.
+
+config KS8851_MLL
+ tristate "Micrel KS8851 MLL"
+ depends on NET_VENDOR_MICREL && HAS_IOMEM
+ select MII
+ ---help---
+ This platform driver is for Micrel KS8851 Address/data bus
+ multiplexed network chip.
+
+config KSZ884X_PCI
+ tristate "Micrel KSZ8841/2 PCI"
+ depends on NET_VENDOR_MICREL && PCI
+ select MII
+ select CRC32
+ ---help---
+ This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
+
+ To compile this driver as a module, choose M here. The module
+ will be called ksz884x.
diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile
new file mode 100644
index 0000000..c050942
--- /dev/null
+++ b/drivers/net/ethernet/micrel/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Micrel network device drivers.
+#
+
+obj-$(CONFIG_KS8842) += ks8842.o
+obj-$(CONFIG_KS8851) += ks8851.o
+obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
+obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o
diff --git a/drivers/net/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
similarity index 100%
rename from drivers/net/ks8842.c
rename to drivers/net/ethernet/micrel/ks8842.c
diff --git a/drivers/net/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
similarity index 100%
rename from drivers/net/ks8851.c
rename to drivers/net/ethernet/micrel/ks8851.c
diff --git a/drivers/net/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
similarity index 100%
rename from drivers/net/ks8851.h
rename to drivers/net/ethernet/micrel/ks8851.h
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ethernet/micrel/ks8851_mll.c
similarity index 100%
rename from drivers/net/ks8851_mll.c
rename to drivers/net/ethernet/micrel/ks8851_mll.c
diff --git a/drivers/net/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
similarity index 100%
rename from drivers/net/ksz884x.c
rename to drivers/net/ethernet/micrel/ksz884x.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 17/72] s2io/vxge: Move the Exar drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Jon Mason
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Exar drivers into drivers/net/ethernet/neterion/ and make the
necessary Kconfig and Makefile changes.
CC: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 3 +-
drivers/net/Kconfig | 34 -------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/neterion/Kconfig | 50 ++++++++++++++++++++
drivers/net/ethernet/neterion/Makefile | 6 ++
drivers/net/{ => ethernet/neterion}/s2io-regs.h | 0
drivers/net/{ => ethernet/neterion}/s2io.c | 0
drivers/net/{ => ethernet/neterion}/s2io.h | 0
drivers/net/{ => ethernet/neterion}/vxge/Makefile | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-config.h | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.c | 0
.../{ => ethernet/neterion}/vxge/vxge-ethtool.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.c | 0
.../net/{ => ethernet/neterion}/vxge/vxge-main.h | 0
.../net/{ => ethernet/neterion}/vxge/vxge-reg.h | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.c | 0
.../{ => ethernet/neterion}/vxge/vxge-traffic.h | 0
.../{ => ethernet/neterion}/vxge/vxge-version.h | 0
21 files changed, 59 insertions(+), 38 deletions(-)
create mode 100644 drivers/net/ethernet/neterion/Kconfig
create mode 100644 drivers/net/ethernet/neterion/Makefile
rename drivers/net/{ => ethernet/neterion}/s2io-regs.h (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.c (100%)
rename drivers/net/{ => ethernet/neterion}/s2io.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/Makefile (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-config.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-ethtool.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-main.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-reg.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.c (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-traffic.h (100%)
rename drivers/net/{ => ethernet/neterion}/vxge/vxge-version.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 81dfcff..816c665 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4321,9 +4321,8 @@ W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
S: Supported
F: Documentation/networking/s2io.txt
-F: drivers/net/s2io*
F: Documentation/networking/vxge.txt
-F: drivers/net/vxge/
+F: drivers/net/ethernet/neterion/
NETFILTER/IPTABLES/IPCHAINS
P: Rusty Russell
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6b58ee3..6294de0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1668,40 +1668,6 @@ config ENIC
help
This enables the support for the Cisco VIC Ethernet card.
-config S2IO
- tristate "Exar Xframe 10Gb Ethernet Adapter"
- depends on PCI
- ---help---
- This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/s2io.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called s2io.
-
-config VXGE
- tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
- depends on PCI && INET
- ---help---
- This driver supports Exar Corp's X3100 Series 10 GbE PCIe
- I/O Virtualized Server Adapter.
-
- More specific information on configuring the driver is in
- <file:Documentation/networking/vxge.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called vxge.
-
-config VXGE_DEBUG_TRACE_ALL
- bool "Enabling All Debug trace statments in driver"
- default n
- depends on VXGE
- ---help---
- Say Y here if you want to enabling all the debug trace statements in
- the vxge driver. By default only few debug trace statements are
- enabled.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 15c3598..5241d6e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -166,8 +166,6 @@ obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DL2K) += dl2k.o
obj-$(CONFIG_R8169) += r8169.o
obj-$(CONFIG_IBMVETH) += ibmveth.o
-obj-$(CONFIG_S2IO) += s2io.o
-obj-$(CONFIG_VXGE) += vxge/
obj-$(CONFIG_SMC911X) += smc911x.o
obj-$(CONFIG_SMSC911X) += smsc911x.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6149413..a23ea19 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,6 +18,7 @@ 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/neterion/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 093b44f..690421d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,6 +9,7 @@ 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_EXAR) += neterion/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
diff --git a/drivers/net/ethernet/neterion/Kconfig b/drivers/net/ethernet/neterion/Kconfig
new file mode 100644
index 0000000..c79fbe9
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Kconfig
@@ -0,0 +1,50 @@
+#
+# Exar device configuration
+#
+
+config NET_VENDOR_EXAR
+ bool "Exar network 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 Exar cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config S2IO
+ tristate "Exar Xframe 10Gb Ethernet Adapter"
+ depends on NET_VENDOR_EXAR && PCI
+ ---help---
+ This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/s2io.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called s2io.
+
+config VXGE
+ tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
+ depends on NET_VENDOR_EXAR && PCI && INET
+ ---help---
+ This driver supports Exar Corp's X3100 Series 10 GbE PCIe
+ I/O Virtualized Server Adapter.
+
+ More specific information on configuring the driver is in
+ <file:Documentation/networking/vxge.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called vxge.
+
+config VXGE_DEBUG_TRACE_ALL
+ bool "Enabling All Debug trace statments in driver"
+ default n
+ depends on VXGE
+ ---help---
+ Say Y here if you want to enabling all the debug trace statements in
+ the vxge driver. By default only few debug trace statements are
+ enabled.
diff --git a/drivers/net/ethernet/neterion/Makefile b/drivers/net/ethernet/neterion/Makefile
new file mode 100644
index 0000000..70c8058
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Exar network device drivers.
+#
+
+obj-$(CONFIG_S2IO) += s2io.o
+obj-$(CONFIG_VXGE) += vxge/
diff --git a/drivers/net/s2io-regs.h b/drivers/net/ethernet/neterion/s2io-regs.h
similarity index 100%
rename from drivers/net/s2io-regs.h
rename to drivers/net/ethernet/neterion/s2io-regs.h
diff --git a/drivers/net/s2io.c b/drivers/net/ethernet/neterion/s2io.c
similarity index 100%
rename from drivers/net/s2io.c
rename to drivers/net/ethernet/neterion/s2io.c
diff --git a/drivers/net/s2io.h b/drivers/net/ethernet/neterion/s2io.h
similarity index 100%
rename from drivers/net/s2io.h
rename to drivers/net/ethernet/neterion/s2io.h
diff --git a/drivers/net/vxge/Makefile b/drivers/net/ethernet/neterion/vxge/Makefile
similarity index 100%
rename from drivers/net/vxge/Makefile
rename to drivers/net/ethernet/neterion/vxge/Makefile
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
similarity index 100%
rename from drivers/net/vxge/vxge-config.c
rename to drivers/net/ethernet/neterion/vxge/vxge-config.c
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
similarity index 100%
rename from drivers/net/vxge/vxge-config.h
rename to drivers/net/ethernet/neterion/vxge/vxge-config.h
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.c
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.h
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
similarity index 100%
rename from drivers/net/vxge/vxge-main.c
rename to drivers/net/ethernet/neterion/vxge/vxge-main.c
diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
similarity index 100%
rename from drivers/net/vxge/vxge-main.h
rename to drivers/net/ethernet/neterion/vxge/vxge-main.h
diff --git a/drivers/net/vxge/vxge-reg.h b/drivers/net/ethernet/neterion/vxge/vxge-reg.h
similarity index 100%
rename from drivers/net/vxge/vxge-reg.h
rename to drivers/net/ethernet/neterion/vxge/vxge-reg.h
diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.c
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.c
diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.h
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.h
diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/ethernet/neterion/vxge/vxge-version.h
similarity index 100%
rename from drivers/net/vxge/vxge-version.h
rename to drivers/net/ethernet/neterion/vxge/vxge-version.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 19/72] enic: Move the Cisco driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, Scott Feldman, Christian Benvenuti,
Vasanthy Kolluri, Roopa Prabhu, David Wang
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
necessary Kconfig and Makefile changes.
CC: Scott Feldman <scofeldm@cisco.com>
CC: Christian Benvenuti <benve@cisco.com>
CC: Vasanthy Kolluri <vkolluri@cisco.com>
CC: Roopa Prabhu <roprabhu@cisco.com>
CC: David Wang <dwang2@cisco.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 6 ------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/cisco/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/cisco/Makefile | 5 +++++
drivers/net/ethernet/cisco/enic/Kconfig | 9 +++++++++
drivers/net/{ => ethernet/cisco}/enic/Makefile | 0
drivers/net/{ => ethernet/cisco}/enic/cq_desc.h | 0
.../net/{ => ethernet/cisco}/enic/cq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_dev.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_main.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_pp.h | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.c | 0
drivers/net/{ => ethernet/cisco}/enic/enic_res.h | 0
.../net/{ => ethernet/cisco}/enic/rq_enet_desc.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_devcmd.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h | 0
.../net/{ => ethernet/cisco}/enic/vnic_resource.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h | 0
| 0
drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c | 0
drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h | 0
.../net/{ => ethernet/cisco}/enic/wq_enet_desc.h | 0
39 files changed, 35 insertions(+), 8 deletions(-)
create mode 100644 drivers/net/ethernet/cisco/Kconfig
create mode 100644 drivers/net/ethernet/cisco/Makefile
create mode 100644 drivers/net/ethernet/cisco/enic/Kconfig
rename drivers/net/{ => ethernet/cisco}/enic/Makefile (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/cq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_main.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_pp.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/enic_res.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/rq_enet_desc.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_cq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_dev.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_devcmd.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_enet.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_intr.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_nic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_resource.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_rss.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_stats.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_vic.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.c (100%)
rename drivers/net/{ => ethernet/cisco}/enic/vnic_wq.h (100%)
rename drivers/net/{ => ethernet/cisco}/enic/wq_enet_desc.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0176793..5fd73ec 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1735,7 +1735,7 @@ M: Vasanthy Kolluri <vkolluri@cisco.com>
M: Roopa Prabhu <roprabhu@cisco.com>
M: David Wang <dwang2@cisco.com>
S: Supported
-F: drivers/net/enic/
+F: drivers/net/ethernet/cisco/enic/
CIRRUS LOGIC EP93XX ETHERNET DRIVER
M: Hartley Sweeten <hsweeten@visionengravers.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7f28373..802e246 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1625,12 +1625,6 @@ if NETDEV_10000
config MDIO
tristate
-config ENIC
- tristate "Cisco VIC Ethernet NIC Support"
- depends on PCI && INET
- help
- This enables the support for the Cisco VIC Ethernet card.
-
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
depends on PPC_PASEMI && PCI && INET
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f0efba2..6198d42 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
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_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 0fd163e..9b333a7 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -17,6 +17,7 @@ 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/cisco/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
source "drivers/net/ethernet/neterion/Kconfig"
source "drivers/net/ethernet/ibm/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 43c912f..6f14a35 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -8,6 +8,7 @@ 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_CISCO) += cisco/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
diff --git a/drivers/net/ethernet/cisco/Kconfig b/drivers/net/ethernet/cisco/Kconfig
new file mode 100644
index 0000000..6d72c34
--- /dev/null
+++ b/drivers/net/ethernet/cisco/Kconfig
@@ -0,0 +1,18 @@
+#
+# Cisco device configuration
+#
+
+config NET_VENDOR_CISCO
+ bool "Cisco 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
+ <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 Cisco cards. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+source "drivers/net/ethernet/cisco/enic/Kconfig"
diff --git a/drivers/net/ethernet/cisco/Makefile b/drivers/net/ethernet/cisco/Makefile
new file mode 100644
index 0000000..6c7437b
--- /dev/null
+++ b/drivers/net/ethernet/cisco/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Cisco device drivers.
+#
+
+obj-$(CONFIG_ENIC) += enic/
diff --git a/drivers/net/ethernet/cisco/enic/Kconfig b/drivers/net/ethernet/cisco/enic/Kconfig
new file mode 100644
index 0000000..dc137af
--- /dev/null
+++ b/drivers/net/ethernet/cisco/enic/Kconfig
@@ -0,0 +1,9 @@
+#
+# Cisco device configuration
+#
+
+config ENIC
+ tristate "Cisco VIC Ethernet NIC Support"
+ depends on NET_VENDOR_CISCO && PCI && INET
+ ---help---
+ This enables the support for the Cisco VIC Ethernet card.
diff --git a/drivers/net/enic/Makefile b/drivers/net/ethernet/cisco/enic/Makefile
similarity index 100%
rename from drivers/net/enic/Makefile
rename to drivers/net/ethernet/cisco/enic/Makefile
diff --git a/drivers/net/enic/cq_desc.h b/drivers/net/ethernet/cisco/enic/cq_desc.h
similarity index 100%
rename from drivers/net/enic/cq_desc.h
rename to drivers/net/ethernet/cisco/enic/cq_desc.h
diff --git a/drivers/net/enic/cq_enet_desc.h b/drivers/net/ethernet/cisco/enic/cq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/cq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/cq_enet_desc.h
diff --git a/drivers/net/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
similarity index 100%
rename from drivers/net/enic/enic.h
rename to drivers/net/ethernet/cisco/enic/enic.h
diff --git a/drivers/net/enic/enic_dev.c b/drivers/net/ethernet/cisco/enic/enic_dev.c
similarity index 100%
rename from drivers/net/enic/enic_dev.c
rename to drivers/net/ethernet/cisco/enic/enic_dev.c
diff --git a/drivers/net/enic/enic_dev.h b/drivers/net/ethernet/cisco/enic/enic_dev.h
similarity index 100%
rename from drivers/net/enic/enic_dev.h
rename to drivers/net/ethernet/cisco/enic/enic_dev.h
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
similarity index 100%
rename from drivers/net/enic/enic_main.c
rename to drivers/net/ethernet/cisco/enic/enic_main.c
diff --git a/drivers/net/enic/enic_pp.c b/drivers/net/ethernet/cisco/enic/enic_pp.c
similarity index 100%
rename from drivers/net/enic/enic_pp.c
rename to drivers/net/ethernet/cisco/enic/enic_pp.c
diff --git a/drivers/net/enic/enic_pp.h b/drivers/net/ethernet/cisco/enic/enic_pp.h
similarity index 100%
rename from drivers/net/enic/enic_pp.h
rename to drivers/net/ethernet/cisco/enic/enic_pp.h
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/ethernet/cisco/enic/enic_res.c
similarity index 100%
rename from drivers/net/enic/enic_res.c
rename to drivers/net/ethernet/cisco/enic/enic_res.c
diff --git a/drivers/net/enic/enic_res.h b/drivers/net/ethernet/cisco/enic/enic_res.h
similarity index 100%
rename from drivers/net/enic/enic_res.h
rename to drivers/net/ethernet/cisco/enic/enic_res.h
diff --git a/drivers/net/enic/rq_enet_desc.h b/drivers/net/ethernet/cisco/enic/rq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/rq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/rq_enet_desc.h
diff --git a/drivers/net/enic/vnic_cq.c b/drivers/net/ethernet/cisco/enic/vnic_cq.c
similarity index 100%
rename from drivers/net/enic/vnic_cq.c
rename to drivers/net/ethernet/cisco/enic/vnic_cq.c
diff --git a/drivers/net/enic/vnic_cq.h b/drivers/net/ethernet/cisco/enic/vnic_cq.h
similarity index 100%
rename from drivers/net/enic/vnic_cq.h
rename to drivers/net/ethernet/cisco/enic/vnic_cq.h
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/ethernet/cisco/enic/vnic_dev.c
similarity index 100%
rename from drivers/net/enic/vnic_dev.c
rename to drivers/net/ethernet/cisco/enic/vnic_dev.c
diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/ethernet/cisco/enic/vnic_dev.h
similarity index 100%
rename from drivers/net/enic/vnic_dev.h
rename to drivers/net/ethernet/cisco/enic/vnic_dev.h
diff --git a/drivers/net/enic/vnic_devcmd.h b/drivers/net/ethernet/cisco/enic/vnic_devcmd.h
similarity index 100%
rename from drivers/net/enic/vnic_devcmd.h
rename to drivers/net/ethernet/cisco/enic/vnic_devcmd.h
diff --git a/drivers/net/enic/vnic_enet.h b/drivers/net/ethernet/cisco/enic/vnic_enet.h
similarity index 100%
rename from drivers/net/enic/vnic_enet.h
rename to drivers/net/ethernet/cisco/enic/vnic_enet.h
diff --git a/drivers/net/enic/vnic_intr.c b/drivers/net/ethernet/cisco/enic/vnic_intr.c
similarity index 100%
rename from drivers/net/enic/vnic_intr.c
rename to drivers/net/ethernet/cisco/enic/vnic_intr.c
diff --git a/drivers/net/enic/vnic_intr.h b/drivers/net/ethernet/cisco/enic/vnic_intr.h
similarity index 100%
rename from drivers/net/enic/vnic_intr.h
rename to drivers/net/ethernet/cisco/enic/vnic_intr.h
diff --git a/drivers/net/enic/vnic_nic.h b/drivers/net/ethernet/cisco/enic/vnic_nic.h
similarity index 100%
rename from drivers/net/enic/vnic_nic.h
rename to drivers/net/ethernet/cisco/enic/vnic_nic.h
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/ethernet/cisco/enic/vnic_resource.h
similarity index 100%
rename from drivers/net/enic/vnic_resource.h
rename to drivers/net/ethernet/cisco/enic/vnic_resource.h
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/ethernet/cisco/enic/vnic_rq.c
similarity index 100%
rename from drivers/net/enic/vnic_rq.c
rename to drivers/net/ethernet/cisco/enic/vnic_rq.c
diff --git a/drivers/net/enic/vnic_rq.h b/drivers/net/ethernet/cisco/enic/vnic_rq.h
similarity index 100%
rename from drivers/net/enic/vnic_rq.h
rename to drivers/net/ethernet/cisco/enic/vnic_rq.h
diff --git a/drivers/net/enic/vnic_rss.h b/drivers/net/ethernet/cisco/enic/vnic_rss.h
similarity index 100%
rename from drivers/net/enic/vnic_rss.h
rename to drivers/net/ethernet/cisco/enic/vnic_rss.h
diff --git a/drivers/net/enic/vnic_stats.h b/drivers/net/ethernet/cisco/enic/vnic_stats.h
similarity index 100%
rename from drivers/net/enic/vnic_stats.h
rename to drivers/net/ethernet/cisco/enic/vnic_stats.h
diff --git a/drivers/net/enic/vnic_vic.c b/drivers/net/ethernet/cisco/enic/vnic_vic.c
similarity index 100%
rename from drivers/net/enic/vnic_vic.c
rename to drivers/net/ethernet/cisco/enic/vnic_vic.c
diff --git a/drivers/net/enic/vnic_vic.h b/drivers/net/ethernet/cisco/enic/vnic_vic.h
similarity index 100%
rename from drivers/net/enic/vnic_vic.h
rename to drivers/net/ethernet/cisco/enic/vnic_vic.h
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/ethernet/cisco/enic/vnic_wq.c
similarity index 100%
rename from drivers/net/enic/vnic_wq.c
rename to drivers/net/ethernet/cisco/enic/vnic_wq.c
diff --git a/drivers/net/enic/vnic_wq.h b/drivers/net/ethernet/cisco/enic/vnic_wq.h
similarity index 100%
rename from drivers/net/enic/vnic_wq.h
rename to drivers/net/ethernet/cisco/enic/vnic_wq.h
diff --git a/drivers/net/enic/wq_enet_desc.h b/drivers/net/ethernet/cisco/enic/wq_enet_desc.h
similarity index 100%
rename from drivers/net/enic/wq_enet_desc.h
rename to drivers/net/ethernet/cisco/enic/wq_enet_desc.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 20/72] pasemic_mac*: Move the PA Semi driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Olof Johansson
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the PA Semi driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 9 ---------
drivers/net/Makefile | 2 --
drivers/net/ethernet/Kconfig | 10 ++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/pasemi_mac.c | 0
drivers/net/{ => ethernet}/pasemi_mac.h | 0
drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
8 files changed, 12 insertions(+), 12 deletions(-)
rename drivers/net/{ => ethernet}/pasemi_mac.c (100%)
rename drivers/net/{ => ethernet}/pasemi_mac.h (100%)
rename drivers/net/{ => ethernet}/pasemi_mac_ethtool.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5fd73ec..65f1282 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4719,7 +4719,7 @@ PA SEMI ETHERNET DRIVER
M: Olof Johansson <olof@lixom.net>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/pasemi_mac.*
+F: drivers/net/ethernet/pasemi_mac*
PA SEMI SMBUS DRIVER
M: Olof Johansson <olof@lixom.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 802e246..de6ff15 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1625,15 +1625,6 @@ if NETDEV_10000
config MDIO
tristate
-config PASEMI_MAC
- tristate "PA Semi 1/10Gbit MAC"
- depends on PPC_PASEMI && PCI && INET
- select PHYLIB
- select INET_LRO
- help
- This driver supports the on-chip 1/10Gbit Ethernet controller on
- PA Semi's PWRficient line of chips.
-
config TEHUTI
tristate "Tehuti Networks 10G Ethernet"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 6198d42..a7bbf98 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -166,8 +166,6 @@ obj-$(CONFIG_SMSC911X) += smsc911x.o
obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
obj-$(CONFIG_DM9000) += dm9000.o
-obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
-pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9b333a7..3174234 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -24,6 +24,16 @@ source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
+
+config PASEMI_MAC
+ tristate "PA Semi 1/10Gbit MAC"
+ depends on PPC_PASEMI && PCI && INET
+ select PHYLIB
+ select INET_LRO
+ ---help---
+ This driver supports the on-chip 1/10Gbit Ethernet controller on
+ PA Semi's PWRficient line of chips.
+
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6f14a35..a7eee02 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/ethernet/pasemi_mac.c
similarity index 100%
rename from drivers/net/pasemi_mac.c
rename to drivers/net/ethernet/pasemi_mac.c
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/ethernet/pasemi_mac.h
similarity index 100%
rename from drivers/net/pasemi_mac.h
rename to drivers/net/ethernet/pasemi_mac.h
diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/ethernet/pasemi_mac_ethtool.c
similarity index 100%
rename from drivers/net/pasemi_mac_ethtool.c
rename to drivers/net/ethernet/pasemi_mac_ethtool.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 44/72] s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Oskar Schirmer, Kong Lai
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.
CC: Oskar Schirmer <os@emlix.com>
CC: Kong Lai <kong.lai@tundra.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 19 -------------------
drivers/net/Makefile | 2 --
drivers/net/ethernet/Kconfig | 21 +++++++++++++++++++++
drivers/net/ethernet/Makefile | 2 ++
drivers/net/{ => ethernet}/s6gmac.c | 0
drivers/net/{ => ethernet}/tsi108_eth.c | 0
drivers/net/{ => ethernet}/tsi108_eth.h | 0
7 files changed, 23 insertions(+), 21 deletions(-)
rename drivers/net/{ => ethernet}/s6gmac.c (100%)
rename drivers/net/{ => ethernet}/tsi108_eth.c (100%)
rename drivers/net/{ => ethernet}/tsi108_eth.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ed588b5..981d7d8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -677,14 +677,6 @@ config YELLOWFIN
To compile this driver as a module, choose M here: the module
will be called yellowfin. This is recommended.
-config TSI108_ETH
- tristate "Tundra TSI108 gigabit Ethernet support"
- depends on TSI108_BRIDGE
- help
- This driver supports Tundra TSI108 gigabit Ethernet ports.
- To compile this driver as a module, choose M here: the module
- will be called tsi108_eth.
-
config GELIC_NET
tristate "PS3 Gigabit Ethernet driver"
depends on PPC_PS3
@@ -728,17 +720,6 @@ config JME
To compile this driver as a module, choose M here. The module
will be called jme.
-config S6GMAC
- tristate "S6105 GMAC ethernet support"
- depends on XTENSA_VARIANT_S6000
- select PHYLIB
- help
- This driver supports the on chip ethernet device on the
- S6105 xtensa processor.
-
- To compile this driver as a module, choose M here. The module
- will be called s6gmac.
-
endif # NETDEV_1000
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f9f3478..2bb8a4e 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -43,7 +43,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
-obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
@@ -91,7 +90,6 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_MACB) += macb.o
-obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 9ade631..c23e7b5 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -72,6 +72,18 @@ config PASEMI_MAC
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
+
+config S6GMAC
+ tristate "S6105 GMAC ethernet support"
+ depends on XTENSA_VARIANT_S6000
+ select PHYLIB
+ ---help---
+ This driver supports the on chip ethernet device on the
+ S6105 xtensa processor.
+
+ To compile this driver as a module, choose M here. The module
+ will be called s6gmac.
+
source "drivers/net/ethernet/sis/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/sgi/Kconfig"
@@ -88,6 +100,15 @@ config TEHUTI
Tehuti Networks 10G Ethernet NIC
source "drivers/net/ethernet/tulip/Kconfig"
+
+config TSI108_ETH
+ tristate "Tundra TSI108 gigabit Ethernet support"
+ depends on TSI108_BRIDGE
+ ---help---
+ This driver supports Tundra TSI108 gigabit Ethernet ports.
+ To compile this driver as a module, choose M here: the module
+ will be called tsi108_eth.
+
source "drivers/net/ethernet/via/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 5704a3b..a243610 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_NET_VENDOR_SIS) += sis/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
@@ -43,4 +44,5 @@ obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_NET_TULIP) += tulip/
+obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/s6gmac.c b/drivers/net/ethernet/s6gmac.c
similarity index 100%
rename from drivers/net/s6gmac.c
rename to drivers/net/ethernet/s6gmac.c
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/ethernet/tsi108_eth.c
similarity index 100%
rename from drivers/net/tsi108_eth.c
rename to drivers/net/ethernet/tsi108_eth.c
diff --git a/drivers/net/tsi108_eth.h b/drivers/net/ethernet/tsi108_eth.h
similarity index 100%
rename from drivers/net/tsi108_eth.h
rename to drivers/net/ethernet/tsi108_eth.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 43/72] a2065/ariadne: Move the a2065/ariadne drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Geert Uytterhoeven
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
the necessary Kconfig and Makefile changes.
CC: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 21 ---------------------
drivers/net/Makefile | 2 --
drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
drivers/net/ethernet/Makefile | 2 ++
drivers/net/{ => ethernet}/a2065.c | 0
drivers/net/{ => ethernet}/a2065.h | 0
drivers/net/{ => ethernet}/ariadne.c | 0
drivers/net/{ => ethernet}/ariadne.h | 0
8 files changed, 25 insertions(+), 23 deletions(-)
rename drivers/net/{ => ethernet}/a2065.c (100%)
rename drivers/net/{ => ethernet}/a2065.h (100%)
rename drivers/net/{ => ethernet}/ariadne.c (100%)
rename drivers/net/{ => ethernet}/ariadne.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ddbdf3c..ed588b5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -235,27 +235,6 @@ config MACB
To compile this driver as a module, choose M here: the module
will be called macb.
-config ARIADNE
- tristate "Ariadne support"
- depends on ZORRO
- help
- If you have a Village Tronic Ariadne Ethernet adapter, say Y.
- Otherwise, say N.
-
- To compile this driver as a module, choose M here: the module
- will be called ariadne.
-
-config A2065
- tristate "A2065 support"
- depends on ZORRO
- select CRC32
- help
- If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
- say N.
-
- To compile this driver as a module, choose M here: the module
- will be called a2065.
-
config LASI_82596
tristate "Lasi ethernet"
depends on GSC
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0d02503..f9f3478 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -79,8 +79,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_KORINA) += korina.o
obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
-obj-$(CONFIG_A2065) += a2065.o
-obj-$(CONFIG_ARIADNE) += ariadne.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 74d98b3..9ade631 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -12,8 +12,31 @@ menuconfig ETHERNET
if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
+
+config A2065
+ tristate "A2065 support"
+ depends on ZORRO
+ select CRC32
+ ---help---
+ If you have a Commodore A2065 Ethernet adapter, say Y. Otherwise,
+ say N.
+
+ To compile this driver as a module, choose M here: the module
+ will be called a2065.
+
source "drivers/net/ethernet/amd/Kconfig"
source "drivers/net/ethernet/apple/Kconfig"
+
+config ARIADNE
+ tristate "Ariadne support"
+ depends on ZORRO
+ ---help---
+ If you have a Village Tronic Ariadne Ethernet adapter, say Y.
+ Otherwise, say N.
+
+ To compile this driver as a module, choose M here: the module
+ will be called ariadne.
+
source "drivers/net/ethernet/arm/Kconfig"
source "drivers/net/ethernet/atheros/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 4a682a7..5704a3b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -4,8 +4,10 @@
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
+obj-$(CONFIG_A2065) += a2065.o
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
+obj-$(CONFIG_ARIADNE) += ariadne.o
obj-$(CONFIG_NET_ARM) += arm/
obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
diff --git a/drivers/net/a2065.c b/drivers/net/ethernet/a2065.c
similarity index 100%
rename from drivers/net/a2065.c
rename to drivers/net/ethernet/a2065.c
diff --git a/drivers/net/a2065.h b/drivers/net/ethernet/a2065.h
similarity index 100%
rename from drivers/net/a2065.h
rename to drivers/net/ethernet/a2065.h
diff --git a/drivers/net/ariadne.c b/drivers/net/ethernet/ariadne.c
similarity index 100%
rename from drivers/net/ariadne.c
rename to drivers/net/ethernet/ariadne.c
diff --git a/drivers/net/ariadne.h b/drivers/net/ethernet/ariadne.h
similarity index 100%
rename from drivers/net/ariadne.h
rename to drivers/net/ethernet/ariadne.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 45/72] tlan/cpmac: Move the TI drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem
Cc: Jeff Kirsher, netdev, Samuel Chessman, torben.mathiasen,
Eugene Konev, Florian Fainelli
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the TI drivers to drivers/net/ethernet/ti/ and make the
necessary Kconfig and Makefile changes.
CC: Samuel Chessman <chessman@tux.org>
CC: <torben.mathiasen@compaq.com>
CC: Eugene Konev <ejka@imfi.kspu.ru>
CC: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 4 +-
drivers/net/Kconfig | 25 --------------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/ti/Kconfig | 41 +++++++++++++++++++++++++++++++++
drivers/net/ethernet/ti/Makefile | 6 +++++
drivers/net/{ => ethernet/ti}/cpmac.c | 0
drivers/net/{ => ethernet/ti}/tlan.c | 0
drivers/net/{ => ethernet/ti}/tlan.h | 0
10 files changed, 51 insertions(+), 29 deletions(-)
create mode 100644 drivers/net/ethernet/ti/Kconfig
create mode 100644 drivers/net/ethernet/ti/Makefile
rename drivers/net/{ => ethernet/ti}/cpmac.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.c (100%)
rename drivers/net/{ => ethernet/ti}/tlan.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index fa2f1bb..cd97122 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1880,7 +1880,7 @@ CPMAC ETHERNET DRIVER
M: Florian Fainelli <florian@openwrt.org>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/cpmac.c
+F: drivers/net/ethernet/ti/cpmac.c
CPU FREQUENCY DRIVERS
M: Dave Jones <davej@redhat.com>
@@ -6188,7 +6188,7 @@ L: tlan-devel@lists.sourceforge.net (subscribers-only)
W: http://sourceforge.net/projects/tlan/
S: Maintained
F: Documentation/networking/tlan.txt
-F: drivers/net/tlan.*
+F: drivers/net/ethernet/ti/tlan.*
TOMOYO SECURITY MODULE
M: Kentaro Takeda <takedakn@nttdata.co.jp>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 981d7d8..7aa7982 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -540,24 +540,6 @@ config SUNDANCE_MMIO
If unsure, say N.
-config TLAN
- tristate "TI ThunderLAN support"
- depends on NET_PCI && (PCI || EISA)
- ---help---
- If you have a PCI Ethernet network card based on the ThunderLAN chip
- which is supported by this driver, say Y and read the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- Devices currently supported by this driver are Compaq Netelligent,
- Compaq NetFlex and Olicom cards. Please read the file
- <file:Documentation/networking/tlan.txt> for more details.
-
- To compile this driver as a module, choose M here. The module
- will be called tlan.
-
- Please email feedback to <torben.mathiasen@compaq.com>.
-
config SC92031
tristate "Silan SC92031 PCI Fast Ethernet Adapter driver (EXPERIMENTAL)"
depends on NET_PCI && PCI && EXPERIMENTAL
@@ -570,13 +552,6 @@ config SC92031
To compile this driver as a module, choose M here: the module
will be called sc92031. This is recommended.
-config CPMAC
- tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
- depends on NET_ETHERNET && EXPERIMENTAL && AR7
- select PHYLIB
- help
- TI AR7 CPMAC Ethernet support
-
config NET_POCKET
bool "Pocket and portable adapters"
depends on PARPORT
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2bb8a4e..4893db5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
@@ -69,7 +68,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_CPMAC) += cpmac.o
obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_LASI_82596) += lasi_82596.o
obj-$(CONFIG_SNI_82596) += sni_82596.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c23e7b5..ed7b4a6 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -99,6 +99,7 @@ config TEHUTI
---help---
Tehuti Networks 10G Ethernet NIC
+source "drivers/net/ethernet/ti/Kconfig"
source "drivers/net/ethernet/tulip/Kconfig"
config TSI108_ETH
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a243610..444c988 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -43,6 +43,7 @@ obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_SYSKONNECT) += syskonnect/
obj-$(CONFIG_TEHUTI) += tehuti.o
+obj-$(CONFIG_NET_TI) += ti/
obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
obj-$(CONFIG_NET_VENDOR_VIA) += via/
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
new file mode 100644
index 0000000..3f45912
--- /dev/null
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -0,0 +1,41 @@
+#
+# TI device configuration
+#
+
+config NET_VENDOR_TI
+ bool "TI devices"
+ depends on PCI || EISA || AR7
+ ---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 TI devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config TLAN
+ tristate "TI ThunderLAN support"
+ depends on NET_VENDOR_TI && (PCI || EISA)
+ ---help---
+ If you have a PCI Ethernet network card based on the ThunderLAN chip
+ which is supported by this driver, say Y and read the
+ Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+ Devices currently supported by this driver are Compaq Netelligent,
+ Compaq NetFlex and Olicom cards. Please read the file
+ <file:Documentation/networking/tlan.txt> for more details.
+
+ To compile this driver as a module, choose M here. The module
+ will be called tlan.
+
+ Please email feedback to <torben.mathiasen@compaq.com>.
+
+config CPMAC
+ tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
+ depends on NET_VENDOR_TI && EXPERIMENTAL && AR7
+ select PHYLIB
+ ---help---
+ TI AR7 CPMAC Ethernet support
diff --git a/drivers/net/ethernet/ti/Makefile b/drivers/net/ethernet/ti/Makefile
new file mode 100644
index 0000000..9d9ad21
--- /dev/null
+++ b/drivers/net/ethernet/ti/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the TI network device drivers.
+#
+
+obj-$(CONFIG_TLAN) += tlan.o
+obj-$(CONFIG_CPMAC) += cpmac.o
diff --git a/drivers/net/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
similarity index 100%
rename from drivers/net/cpmac.c
rename to drivers/net/ethernet/ti/cpmac.c
diff --git a/drivers/net/tlan.c b/drivers/net/ethernet/ti/tlan.c
similarity index 100%
rename from drivers/net/tlan.c
rename to drivers/net/ethernet/ti/tlan.c
diff --git a/drivers/net/tlan.h b/drivers/net/ethernet/ti/tlan.h
similarity index 100%
rename from drivers/net/tlan.h
rename to drivers/net/ethernet/ti/tlan.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 46/72] ixp2000: Move the Radisys driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Lennert Buytenhek
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Radisys driver into drivers/net/ethernet/radisys/ and
make the necessary Kconfig and Makefile changes
CC: Lennert Buytenhek <kernel@wantstofly.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/radisys/Kconfig | 16 ++++++++++++++++
drivers/net/ethernet/radisys/Makefile | 5 +++++
drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig | 2 +-
.../net/{ => ethernet/radisys}/ixp2000/Makefile | 0
drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c | 0
drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h | 0
.../net/{ => ethernet/radisys}/ixp2000/enp2611.c | 0
.../{ => ethernet/radisys}/ixp2000/ixp2400-msf.c | 0
.../{ => ethernet/radisys}/ixp2000/ixp2400-msf.h | 0
.../{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc | 0
.../radisys}/ixp2000/ixp2400_rx.ucode | 0
.../{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc | 0
.../radisys}/ixp2000/ixp2400_tx.ucode | 0
.../net/{ => ethernet/radisys}/ixp2000/ixpdev.c | 0
.../net/{ => ethernet/radisys}/ixp2000/ixpdev.h | 0
.../{ => ethernet/radisys}/ixp2000/ixpdev_priv.h | 0
.../net/{ => ethernet/radisys}/ixp2000/pm3386.c | 0
.../net/{ => ethernet/radisys}/ixp2000/pm3386.h | 0
23 files changed, 25 insertions(+), 5 deletions(-)
create mode 100644 drivers/net/ethernet/radisys/Kconfig
create mode 100644 drivers/net/ethernet/radisys/Makefile
rename drivers/net/{ => ethernet/radisys}/ixp2000/Kconfig (80%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/Makefile (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.c (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/caleb.h (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/enp2611.c (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.c (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400-msf.h (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.uc (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_rx.ucode (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.uc (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixp2400_tx.ucode (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.c (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev.h (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/ixpdev_priv.h (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.c (100%)
rename drivers/net/{ => ethernet/radisys}/ixp2000/pm3386.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index cd97122..07ac87b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3299,7 +3299,7 @@ INTEL IXP2000 ETHERNET DRIVER
M: Lennert Buytenhek <kernel@wantstofly.org>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ixp2000/
+F: drivers/net/ethernet/ixp2000/
INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf)
M: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 7aa7982..fd11a55 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -624,8 +624,6 @@ config IP1000
To compile this driver as a module, choose M here: the module
will be called ipg. This is recommended.
-source "drivers/net/ixp2000/Kconfig"
-
config HAMACHI
tristate "Packet Engines Hamachi GNIC-II support"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4893db5..7f63be8 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -109,7 +109,6 @@ obj-$(CONFIG_WLAN) += wireless/
obj-$(CONFIG_HAMRADIO) += hamradio/
obj-$(CONFIG_IRDA) += irda/
obj-$(CONFIG_ETRAX_ETHERNET) += cris/
-obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
obj-$(CONFIG_NETCONSOLE) += netconsole.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ed7b4a6..c000dc2 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -71,6 +71,7 @@ config PASEMI_MAC
source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
+source "drivers/net/ethernet/radisys/Kconfig"
source "drivers/net/ethernet/realtek/Kconfig"
config S6GMAC
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 444c988..d54eb3d 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -32,6 +32,7 @@ obj-$(CONFIG_NET_VENDOR_OKI) += oki/
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
+obj-$(CONFIG_NET_VENDOR_RADISYS) += radisys/
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_NET_VENDOR_SIS) += sis/
diff --git a/drivers/net/ethernet/radisys/Kconfig b/drivers/net/ethernet/radisys/Kconfig
new file mode 100644
index 0000000..bcbd604
--- /dev/null
+++ b/drivers/net/ethernet/radisys/Kconfig
@@ -0,0 +1,16 @@
+#
+# Radisys device configuration
+#
+
+config NET_VENDOR_RADISYS
+ bool "Radisys devices"
+ depends on ARCH_ENP2611
+ ---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 Radisys cards. If you say Y, you will be asked for
+ your specific card in the following questions.
diff --git a/drivers/net/ethernet/radisys/Makefile b/drivers/net/ethernet/radisys/Makefile
new file mode 100644
index 0000000..c946cf2
--- /dev/null
+++ b/drivers/net/ethernet/radisys/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Radisys device drivers.
+#
+
+obj-$(CONFIG_ENP2611_MSF_NET) += ixp2000/
diff --git a/drivers/net/ixp2000/Kconfig b/drivers/net/ethernet/radisys/ixp2000/Kconfig
similarity index 80%
rename from drivers/net/ixp2000/Kconfig
rename to drivers/net/ethernet/radisys/ixp2000/Kconfig
index 2fec241..3cd6ded 100644
--- a/drivers/net/ixp2000/Kconfig
+++ b/drivers/net/ethernet/radisys/ixp2000/Kconfig
@@ -1,6 +1,6 @@
config ENP2611_MSF_NET
tristate "Radisys ENP2611 MSF network interface support"
- depends on ARCH_ENP2611
+ depends on NET_VENDOR_RADISYS && ARCH_ENP2611
help
This is a driver for the MSF network interface unit in
the IXP2400 on the Radisys ENP2611 platform.
diff --git a/drivers/net/ixp2000/Makefile b/drivers/net/ethernet/radisys/ixp2000/Makefile
similarity index 100%
rename from drivers/net/ixp2000/Makefile
rename to drivers/net/ethernet/radisys/ixp2000/Makefile
diff --git a/drivers/net/ixp2000/caleb.c b/drivers/net/ethernet/radisys/ixp2000/caleb.c
similarity index 100%
rename from drivers/net/ixp2000/caleb.c
rename to drivers/net/ethernet/radisys/ixp2000/caleb.c
diff --git a/drivers/net/ixp2000/caleb.h b/drivers/net/ethernet/radisys/ixp2000/caleb.h
similarity index 100%
rename from drivers/net/ixp2000/caleb.h
rename to drivers/net/ethernet/radisys/ixp2000/caleb.h
diff --git a/drivers/net/ixp2000/enp2611.c b/drivers/net/ethernet/radisys/ixp2000/enp2611.c
similarity index 100%
rename from drivers/net/ixp2000/enp2611.c
rename to drivers/net/ethernet/radisys/ixp2000/enp2611.c
diff --git a/drivers/net/ixp2000/ixp2400-msf.c b/drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.c
similarity index 100%
rename from drivers/net/ixp2000/ixp2400-msf.c
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.c
diff --git a/drivers/net/ixp2000/ixp2400-msf.h b/drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.h
similarity index 100%
rename from drivers/net/ixp2000/ixp2400-msf.h
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400-msf.h
diff --git a/drivers/net/ixp2000/ixp2400_rx.uc b/drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.uc
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_rx.uc
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.uc
diff --git a/drivers/net/ixp2000/ixp2400_rx.ucode b/drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.ucode
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_rx.ucode
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_rx.ucode
diff --git a/drivers/net/ixp2000/ixp2400_tx.uc b/drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.uc
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_tx.uc
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.uc
diff --git a/drivers/net/ixp2000/ixp2400_tx.ucode b/drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.ucode
similarity index 100%
rename from drivers/net/ixp2000/ixp2400_tx.ucode
rename to drivers/net/ethernet/radisys/ixp2000/ixp2400_tx.ucode
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ethernet/radisys/ixp2000/ixpdev.c
similarity index 100%
rename from drivers/net/ixp2000/ixpdev.c
rename to drivers/net/ethernet/radisys/ixp2000/ixpdev.c
diff --git a/drivers/net/ixp2000/ixpdev.h b/drivers/net/ethernet/radisys/ixp2000/ixpdev.h
similarity index 100%
rename from drivers/net/ixp2000/ixpdev.h
rename to drivers/net/ethernet/radisys/ixp2000/ixpdev.h
diff --git a/drivers/net/ixp2000/ixpdev_priv.h b/drivers/net/ethernet/radisys/ixp2000/ixpdev_priv.h
similarity index 100%
rename from drivers/net/ixp2000/ixpdev_priv.h
rename to drivers/net/ethernet/radisys/ixp2000/ixpdev_priv.h
diff --git a/drivers/net/ixp2000/pm3386.c b/drivers/net/ethernet/radisys/ixp2000/pm3386.c
similarity index 100%
rename from drivers/net/ixp2000/pm3386.c
rename to drivers/net/ethernet/radisys/ixp2000/pm3386.c
diff --git a/drivers/net/ixp2000/pm3386.h b/drivers/net/ethernet/radisys/ixp2000/pm3386.h
similarity index 100%
rename from drivers/net/ixp2000/pm3386.h
rename to drivers/net/ethernet/radisys/ixp2000/pm3386.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 21/72] tehuti: Move the Tehuti driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Alexander Indenbaum, Andy Gospodarek
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Tehuti driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Alexander Indenbaum <baum@tehutinetworks.net>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 6 ------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 6 ++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/tehuti.c | 0
drivers/net/{ => ethernet}/tehuti.h | 0
7 files changed, 8 insertions(+), 8 deletions(-)
rename drivers/net/{ => ethernet}/tehuti.c (100%)
rename drivers/net/{ => ethernet}/tehuti.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 65f1282..015e658 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6129,7 +6129,7 @@ M: Alexander Indenbaum <baum@tehutinetworks.net>
M: Andy Gospodarek <andy@greyhouse.net>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/tehuti*
+F: drivers/net/ethernet/tehuti*
Telecom Clock Driver for MCPL0010
M: Mark Gross <mark.gross@intel.com>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index de6ff15..1e157e7 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1625,12 +1625,6 @@ if NETDEV_10000
config MDIO
tristate
-config TEHUTI
- tristate "Tehuti Networks 10G Ethernet"
- depends on PCI
- help
- Tehuti Networks 10G Ethernet NIC
-
endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a7bbf98..2c90508 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ATL1E) += atl1e/
obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
-obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3174234..74573fa 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -40,4 +40,10 @@ source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
+config TEHUTI
+ tristate "Tehuti Networks 10G Ethernet"
+ depends on PCI
+ ---help---
+ Tehuti Networks 10G Ethernet NIC
+
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index a7eee02..d98ae32 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMC) += smc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+obj-$(CONFIG_TEHUTI) += tehuti.o
diff --git a/drivers/net/tehuti.c b/drivers/net/ethernet/tehuti.c
similarity index 100%
rename from drivers/net/tehuti.c
rename to drivers/net/ethernet/tehuti.c
diff --git a/drivers/net/tehuti.h b/drivers/net/ethernet/tehuti.h
similarity index 100%
rename from drivers/net/tehuti.h
rename to drivers/net/ethernet/tehuti.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 23/72] bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Paul Mackerras, Paul Mackerras,
Russell Nelson
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Apple drivers into driver/net/ethernet/apple/ and make the
necessary Kconfig and Makefile changes.
CC: Paul Mackerras <paulus@samba.org>
CC: Paul Mackerras <paulus@au.ibm.com>
CC: Russell Nelson <nelson@crynwr.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 75 ----------------------
drivers/net/Makefile | 6 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/apple/Kconfig | 92 ++++++++++++++++++++++++++++
drivers/net/ethernet/apple/Makefile | 9 +++
drivers/net/{ => ethernet/apple}/bmac.c | 0
drivers/net/{ => ethernet/apple}/bmac.h | 0
drivers/net/{ => ethernet/apple}/cs89x0.c | 0
drivers/net/{ => ethernet/apple}/cs89x0.h | 0
drivers/net/{ => ethernet/apple}/mac89x0.c | 0
drivers/net/{ => ethernet/apple}/mace.c | 0
drivers/net/{ => ethernet/apple}/mace.h | 0
drivers/net/{ => ethernet/apple}/macmace.c | 0
14 files changed, 103 insertions(+), 81 deletions(-)
create mode 100644 drivers/net/ethernet/apple/Kconfig
create mode 100644 drivers/net/ethernet/apple/Makefile
rename drivers/net/{ => ethernet/apple}/bmac.c (100%)
rename drivers/net/{ => ethernet/apple}/bmac.h (100%)
rename drivers/net/{ => ethernet/apple}/cs89x0.c (100%)
rename drivers/net/{ => ethernet/apple}/cs89x0.h (100%)
rename drivers/net/{ => ethernet/apple}/mac89x0.c (100%)
rename drivers/net/{ => ethernet/apple}/mace.c (100%)
rename drivers/net/{ => ethernet/apple}/mace.h (100%)
rename drivers/net/{ => ethernet/apple}/macmace.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4be1bcf..56c963a 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -237,40 +237,6 @@ config MACB
source "drivers/net/arm/Kconfig"
-config MACE
- tristate "MACE (Power Mac ethernet) support"
- depends on PPC_PMAC && PPC32
- select CRC32
- help
- Power Macintoshes and clones with Ethernet built-in on the
- motherboard will usually use a MACE (Medium Access Control for
- Ethernet) interface. Say Y to include support for the MACE chip.
-
- To compile this driver as a module, choose M here: the module
- will be called mace.
-
-config MACE_AAUI_PORT
- bool "Use AAUI port instead of TP by default"
- depends on MACE
- help
- Some Apple machines (notably the Apple Network Server) which use the
- MACE ethernet chip have an Apple AUI port (small 15-pin connector),
- instead of an 8-pin RJ45 connector for twisted-pair ethernet. Say
- Y here if you have such a machine. If unsure, say N.
- The driver will default to AAUI on ANS anyway, and if you use it as
- a module, you can provide the port_aaui=0|1 to force the driver.
-
-config BMAC
- tristate "BMAC (G3 ethernet) support"
- depends on PPC_PMAC && PPC32
- select CRC32
- help
- Say Y for support of BMAC Ethernet interfaces. These are used on G3
- computers.
-
- To compile this driver as a module, choose M here: the module
- will be called bmac.
-
config ARIADNE
tristate "Ariadne support"
depends on ZORRO
@@ -292,18 +258,6 @@ config A2065
To compile this driver as a module, choose M here: the module
will be called a2065.
-config MAC89x0
- tristate "Macintosh CS89x0 based ethernet cards"
- depends on MAC
- ---help---
- Support for CS89x0 chipset based Ethernet cards. If you have a
- Nubus or LC-PDS network (Ethernet) card of this type, say Y and
- read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. This module will
- be called mac89x0.
-
config MACSONIC
tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"
depends on MAC
@@ -317,16 +271,6 @@ config MACSONIC
To compile this driver as a module, choose M here. This module will
be called macsonic.
-config MACMACE
- bool "Macintosh (AV) onboard MACE ethernet"
- depends on MAC
- select CRC32
- help
- Support for the onboard AMD 79C940 MACE Ethernet controller used in
- the 660AV and 840AV Macintosh. If you have one of these Macintoshes
- say Y and read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
config MVME16x_NET
tristate "MVME16x Ethernet support"
depends on MVME16x
@@ -831,25 +775,6 @@ config FORCEDETH
To compile this driver as a module, choose M here. The module
will be called forcedeth.
-config CS89x0
- tristate "CS89x0 support"
- depends on NET_ETHERNET && (ISA || EISA || MACH_IXDP2351 \
- || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
- ---help---
- Support for CS89x0 chipset based Ethernet cards. If you have a
- network (Ethernet) card of this type, say Y and read the
- Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto> as well as
- <file:Documentation/networking/cs89x0.txt>.
-
- To compile this driver as a module, choose M here. The module
- will be called cs89x0.
-
-config CS89x0_NONISA_IRQ
- def_bool y
- depends on CS89x0 != n
- depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
-
config TC35815
tristate "TOSHIBA TC35815 Ethernet support"
depends on NET_PCI && PCI && MIPS
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9a73e0f..9ac99cd 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -38,9 +38,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_MACE) += mace.o
-obj-$(CONFIG_BMAC) += bmac.o
-
obj-$(CONFIG_TLAN) += tlan.o
obj-$(CONFIG_SMSC9420) += smsc9420.o
obj-$(CONFIG_SIS190) += sis190.o
@@ -150,10 +147,7 @@ obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o
obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o
obj-$(CONFIG_A2065) += a2065.o
obj-$(CONFIG_ARIADNE) += ariadne.o
-obj-$(CONFIG_CS89x0) += cs89x0.o
obj-$(CONFIG_MACSONIC) += macsonic.o
-obj-$(CONFIG_MACMACE) += macmace.o
-obj-$(CONFIG_MAC89x0) += mac89x0.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 4714825..28b473b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,6 +14,7 @@ if ETHERNET
source "drivers/net/ethernet/3com/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/amd/Kconfig"
+source "drivers/net/ethernet/apple/Kconfig"
source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 76ea04b..40dded7 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
obj-$(CONFIG_NET_VENDOR_8390) += 8390/
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
+obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig
new file mode 100644
index 0000000..018fab6
--- /dev/null
+++ b/drivers/net/ethernet/apple/Kconfig
@@ -0,0 +1,92 @@
+#
+# Apple device configuration
+#
+
+config NET_VENDOR_APPLE
+ bool "Apple devices"
+ depends on PPC_PMAC || PPC32 || MAC || ISA || EISA || MACH_IXDP2351 \
+ || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
+ ---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 IBM devices. If you say Y, you will be asked for
+ your specific card in the following questions.
+
+config MACE
+ tristate "MACE (Power Mac ethernet) support"
+ depends on NET_VENDOR_APPLE && PPC_PMAC && PPC32
+ select CRC32
+ ---help---
+ Power Macintoshes and clones with Ethernet built-in on the
+ motherboard will usually use a MACE (Medium Access Control for
+ Ethernet) interface. Say Y to include support for the MACE chip.
+
+ To compile this driver as a module, choose M here: the module
+ will be called mace.
+
+config MACE_AAUI_PORT
+ bool "Use AAUI port instead of TP by default"
+ depends on MACE
+ ---help---
+ Some Apple machines (notably the Apple Network Server) which use the
+ MACE ethernet chip have an Apple AUI port (small 15-pin connector),
+ instead of an 8-pin RJ45 connector for twisted-pair ethernet. Say
+ Y here if you have such a machine. If unsure, say N.
+ The driver will default to AAUI on ANS anyway, and if you use it as
+ a module, you can provide the port_aaui=0|1 to force the driver.
+
+config BMAC
+ tristate "BMAC (G3 ethernet) support"
+ depends on NET_VENDOR_APPLE && PPC_PMAC && PPC32
+ select CRC32
+ ---help---
+ Say Y for support of BMAC Ethernet interfaces. These are used on G3
+ computers.
+
+ To compile this driver as a module, choose M here: the module
+ will be called bmac.
+
+config MAC89x0
+ tristate "Macintosh CS89x0 based ethernet cards"
+ depends on NET_VENDOR_APPLE && MAC
+ ---help---
+ Support for CS89x0 chipset based Ethernet cards. If you have a
+ Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+ read the Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+ To compile this driver as a module, choose M here. This module will
+ be called mac89x0.
+
+config MACMACE
+ bool "Macintosh (AV) onboard MACE ethernet"
+ depends on NET_VENDOR_APPLE && MAC
+ select CRC32
+ ---help---
+ Support for the onboard AMD 79C940 MACE Ethernet controller used in
+ the 660AV and 840AV Macintosh. If you have one of these Macintoshes
+ say Y and read the Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+config CS89x0
+ tristate "CS89x0 support"
+ depends on NET_VENDOR_APPLE && (ISA || EISA || MACH_IXDP2351 \
+ || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440)
+ ---help---
+ Support for CS89x0 chipset based Ethernet cards. If you have a
+ network (Ethernet) card of this type, say Y and read the
+ Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto> as well as
+ <file:Documentation/networking/cs89x0.txt>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called cs89x0.
+
+config CS89x0_NONISA_IRQ
+ def_bool y
+ depends on CS89x0 != n
+ depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile
new file mode 100644
index 0000000..9d30086
--- /dev/null
+++ b/drivers/net/ethernet/apple/Makefile
@@ -0,0 +1,9 @@
+#
+# Makefile for the Apple network device drivers.
+#
+
+obj-$(CONFIG_MACE) += mace.o
+obj-$(CONFIG_BMAC) += bmac.o
+obj-$(CONFIG_MAC89x0) += mac89x0.o
+obj-$(CONFIG_CS89x0) += cs89x0.o
+obj-$(CONFIG_MACMACE) += macmace.o
diff --git a/drivers/net/bmac.c b/drivers/net/ethernet/apple/bmac.c
similarity index 100%
rename from drivers/net/bmac.c
rename to drivers/net/ethernet/apple/bmac.c
diff --git a/drivers/net/bmac.h b/drivers/net/ethernet/apple/bmac.h
similarity index 100%
rename from drivers/net/bmac.h
rename to drivers/net/ethernet/apple/bmac.h
diff --git a/drivers/net/cs89x0.c b/drivers/net/ethernet/apple/cs89x0.c
similarity index 100%
rename from drivers/net/cs89x0.c
rename to drivers/net/ethernet/apple/cs89x0.c
diff --git a/drivers/net/cs89x0.h b/drivers/net/ethernet/apple/cs89x0.h
similarity index 100%
rename from drivers/net/cs89x0.h
rename to drivers/net/ethernet/apple/cs89x0.h
diff --git a/drivers/net/mac89x0.c b/drivers/net/ethernet/apple/mac89x0.c
similarity index 100%
rename from drivers/net/mac89x0.c
rename to drivers/net/ethernet/apple/mac89x0.c
diff --git a/drivers/net/mace.c b/drivers/net/ethernet/apple/mace.c
similarity index 100%
rename from drivers/net/mace.c
rename to drivers/net/ethernet/apple/mace.c
diff --git a/drivers/net/mace.h b/drivers/net/ethernet/apple/mace.h
similarity index 100%
rename from drivers/net/mace.h
rename to drivers/net/ethernet/apple/mace.h
diff --git a/drivers/net/macmace.c b/drivers/net/ethernet/apple/macmace.c
similarity index 100%
rename from drivers/net/macmace.c
rename to drivers/net/ethernet/apple/macmace.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 22/72] stmmac: Move the STMicroelectronics driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Giuseppe Cavallaro
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and
make the necessary Kconfig and Makefile changes.
CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/stmicro/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/stmicro/Makefile | 5 +++++
drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig | 14 +++++++-------
drivers/net/{ => ethernet/stmicro}/stmmac/Makefile | 0
drivers/net/{ => ethernet/stmicro}/stmmac/common.h | 0
drivers/net/{ => ethernet/stmicro}/stmmac/descs.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac100.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac1000.h | 0
.../{ => ethernet/stmicro}/stmmac/dwmac1000_core.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac100_core.c | 0
.../{ => ethernet/stmicro}/stmmac/dwmac100_dma.c | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h | 0
.../net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c | 0
.../net/{ => ethernet/stmicro}/stmmac/enh_desc.c | 0
.../net/{ => ethernet/stmicro}/stmmac/norm_desc.c | 0
drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_main.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_mdio.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_timer.c | 0
.../{ => ethernet/stmicro}/stmmac/stmmac_timer.h | 0
27 files changed, 33 insertions(+), 11 deletions(-)
create mode 100644 drivers/net/ethernet/stmicro/Kconfig
create mode 100644 drivers/net/ethernet/stmicro/Makefile
rename drivers/net/{ => ethernet/stmicro}/stmmac/Kconfig (92%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/Makefile (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/common.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/descs.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_core.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac1000_dma.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_core.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac100_dma.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_dma.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/dwmac_lib.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/enh_desc.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/norm_desc.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac.h (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_ethtool.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_main.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_mdio.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.c (100%)
rename drivers/net/{ => ethernet/stmicro}/stmmac/stmmac_timer.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 015e658..6f822c6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1996,7 +1996,7 @@ M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
L: netdev@vger.kernel.org
W: http://www.stlinux.com
S: Supported
-F: drivers/net/stmmac/
+F: drivers/net/ethernet/stmicro/stmmac/
CYBERPRO FB DRIVER
M: Russell King <linux@arm.linux.org.uk>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 1e157e7..4be1bcf 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1574,8 +1574,6 @@ config S6GMAC
To compile this driver as a module, choose M here. The module
will be called s6gmac.
-source "drivers/net/stmmac/Kconfig"
-
config PCH_GBE
tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"
depends on PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 2c90508..9a73e0f 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -69,7 +69,6 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_SH_ETH) += sh_eth.o
-obj-$(CONFIG_STMMAC_ETH) += stmmac/
#
# end link order section
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 74573fa..4714825 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -38,6 +38,7 @@ source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smc/Kconfig"
+source "drivers/net/ethernet/stmicro/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
config TEHUTI
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d98ae32..76ea04b 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -20,5 +20,6 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMC) += smc/
+obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_TEHUTI) += tehuti.o
diff --git a/drivers/net/ethernet/stmicro/Kconfig b/drivers/net/ethernet/stmicro/Kconfig
new file mode 100644
index 0000000..d4f7e02
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/Kconfig
@@ -0,0 +1,18 @@
+#
+# STMicroelectronics device configuration
+#
+
+config NET_VENDOR_STMICRO
+ bool "STMicroelectronics devices"
+ depends on HAS_IOMEM
+ ---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 STMicroelectronics cards. If you say Y, you will
+ be asked for your specific card in the following questions.
+
+source "drivers/net/ethernet/stmicro/stmmac/Kconfig"
diff --git a/drivers/net/ethernet/stmicro/Makefile b/drivers/net/ethernet/stmicro/Makefile
new file mode 100644
index 0000000..9b3bfdd
--- /dev/null
+++ b/drivers/net/ethernet/stmicro/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the STMicroelectronics device drivers.
+#
+
+obj-$(CONFIG_STMMAC_ETH) += stmmac/
diff --git a/drivers/net/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
similarity index 92%
rename from drivers/net/stmmac/Kconfig
rename to drivers/net/ethernet/stmicro/stmmac/Kconfig
index 7df7df4..e1d915d 100644
--- a/drivers/net/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -1,10 +1,10 @@
config STMMAC_ETH
tristate "STMicroelectronics 10/100/1000 Ethernet driver"
+ depends on NET_VENDOR_STMICRO && HAS_IOMEM
select MII
select PHYLIB
select CRC32
- depends on NETDEVICES && HAS_IOMEM
- help
+ ---help---
This is the driver for the Ethernet IPs are built around a
Synopsys IP Core and only tested on the STMicroelectronics
platforms.
@@ -14,7 +14,7 @@ if STMMAC_ETH
config STMMAC_DA
bool "STMMAC DMA arbitration scheme"
default n
- help
+ ---help---
Selecting this option, rx has priority over Tx (only for Giga
Ethernet device).
By default, the DMA arbitration scheme is based on Round-robin
@@ -24,7 +24,7 @@ config STMMAC_DUAL_MAC
bool "STMMAC: dual mac support (EXPERIMENTAL)"
default n
depends on EXPERIMENTAL && STMMAC_ETH && !STMMAC_TIMER
- help
+ ---help---
Some ST SoCs (for example the stx7141 and stx7200c2) have two
Ethernet Controllers. This option turns on the second Ethernet
device on this kind of platforms.
@@ -33,7 +33,7 @@ config STMMAC_TIMER
bool "STMMAC Timer optimisation"
default n
depends on RTC_HCTOSYS_DEVICE
- help
+ ---help---
Use an external timer for mitigating the number of network
interrupts. Currently, for SH architectures, it is possible
to use the TMU channel 2 and the SH-RTC device.
@@ -45,12 +45,12 @@ choice
config STMMAC_TMU_TIMER
bool "TMU channel 2"
depends on CPU_SH4
- help
+ ---help---
config STMMAC_RTC_TIMER
bool "Real time clock"
depends on RTC_CLASS
- help
+ ---help---
endchoice
diff --git a/drivers/net/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile
similarity index 100%
rename from drivers/net/stmmac/Makefile
rename to drivers/net/ethernet/stmicro/stmmac/Makefile
diff --git a/drivers/net/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
similarity index 100%
rename from drivers/net/stmmac/common.h
rename to drivers/net/ethernet/stmicro/stmmac/common.h
diff --git a/drivers/net/stmmac/descs.h b/drivers/net/ethernet/stmicro/stmmac/descs.h
similarity index 100%
rename from drivers/net/stmmac/descs.h
rename to drivers/net/ethernet/stmicro/stmmac/descs.h
diff --git a/drivers/net/stmmac/dwmac100.h b/drivers/net/ethernet/stmicro/stmmac/dwmac100.h
similarity index 100%
rename from drivers/net/stmmac/dwmac100.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100.h
diff --git a/drivers/net/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
similarity index 100%
rename from drivers/net/stmmac/dwmac1000.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
similarity index 100%
rename from drivers/net/stmmac/dwmac1000_core.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
diff --git a/drivers/net/stmmac/dwmac1000_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
similarity index 100%
rename from drivers/net/stmmac/dwmac1000_dma.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac1000_dma.c
diff --git a/drivers/net/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
similarity index 100%
rename from drivers/net/stmmac/dwmac100_core.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
diff --git a/drivers/net/stmmac/dwmac100_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
similarity index 100%
rename from drivers/net/stmmac/dwmac100_dma.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c
diff --git a/drivers/net/stmmac/dwmac_dma.h b/drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
similarity index 100%
rename from drivers/net/stmmac/dwmac_dma.h
rename to drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h
diff --git a/drivers/net/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
similarity index 100%
rename from drivers/net/stmmac/dwmac_lib.c
rename to drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
diff --git a/drivers/net/stmmac/enh_desc.c b/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
similarity index 100%
rename from drivers/net/stmmac/enh_desc.c
rename to drivers/net/ethernet/stmicro/stmmac/enh_desc.c
diff --git a/drivers/net/stmmac/norm_desc.c b/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
similarity index 100%
rename from drivers/net/stmmac/norm_desc.c
rename to drivers/net/ethernet/stmicro/stmmac/norm_desc.c
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
similarity index 100%
rename from drivers/net/stmmac/stmmac.h
rename to drivers/net/ethernet/stmicro/stmmac/stmmac.h
diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_ethtool.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_main.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
diff --git a/drivers/net/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_mdio.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
diff --git a/drivers/net/stmmac/stmmac_timer.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
similarity index 100%
rename from drivers/net/stmmac/stmmac_timer.c
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_timer.c
diff --git a/drivers/net/stmmac/stmmac_timer.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
similarity index 100%
rename from drivers/net/stmmac/stmmac_timer.h
rename to drivers/net/ethernet/stmicro/stmmac/stmmac_timer.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 48/72] octeon: Move the Cavium driver
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, David Daney
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Cavium driver to drivers/net/ethernet/octeon/ and
make the necessary Kconfig and Makefile changes.
CC: David Daney <ddaney@caviumnetworks.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 2 --
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/octeon/Kconfig | 0
drivers/net/{ => ethernet}/octeon/Makefile | 0
drivers/net/{ => ethernet}/octeon/octeon_mgmt.c | 0
7 files changed, 2 insertions(+), 3 deletions(-)
rename drivers/net/{ => ethernet}/octeon/Kconfig (100%)
rename drivers/net/{ => ethernet}/octeon/Makefile (100%)
rename drivers/net/{ => ethernet}/octeon/octeon_mgmt.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fb16747..f4708d4 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -589,8 +589,6 @@ config LANTIQ_ETOP
help
Support for the MII0 inside the Lantiq SoC
-source "drivers/net/octeon/Kconfig"
-
endif # NET_ETHERNET
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f473c26..a53f0b3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -115,5 +115,4 @@ obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_WIMAX) += wimax/
obj-$(CONFIG_CAIF) += caif/
-obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
obj-$(CONFIG_TILE_NET) += tile/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index cf3da85..7e83747 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -57,6 +57,7 @@ source "drivers/net/ethernet/motorola/Kconfig"
source "drivers/net/ethernet/myricom/Kconfig"
source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
+source "drivers/net/ethernet/octeon/Kconfig"
source "drivers/net/ethernet/isa/Kconfig"
source "drivers/net/ethernet/oki/Kconfig"
source "drivers/net/ethernet/packetengines/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0c6c7a5..b2f51c5 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
obj-$(CONFIG_NET_ISA) += isa/
obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_OKI) += oki/
diff --git a/drivers/net/octeon/Kconfig b/drivers/net/ethernet/octeon/Kconfig
similarity index 100%
rename from drivers/net/octeon/Kconfig
rename to drivers/net/ethernet/octeon/Kconfig
diff --git a/drivers/net/octeon/Makefile b/drivers/net/ethernet/octeon/Makefile
similarity index 100%
rename from drivers/net/octeon/Makefile
rename to drivers/net/ethernet/octeon/Makefile
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c
similarity index 100%
rename from drivers/net/octeon/octeon_mgmt.c
rename to drivers/net/ethernet/octeon/octeon_mgmt.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 47/72] hamachi/yellowfin: Move the packet engine drivers
From: Jeff Kirsher @ 2011-06-25 13:58 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Donald Becker
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the packet engine drivers to drivers/net/ethernet/pktgen/ and
the necessary Kconfig and Makefile changes.
CC: Donald Becker <becker@scyld.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 26 ------------
drivers/net/Makefile | 2 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/packetengines/Kconfig | 42 ++++++++++++++++++++
drivers/net/ethernet/packetengines/Makefile | 6 +++
drivers/net/{ => ethernet/packetengines}/hamachi.c | 0
.../net/{ => ethernet/packetengines}/yellowfin.c | 0
8 files changed, 50 insertions(+), 28 deletions(-)
create mode 100644 drivers/net/ethernet/packetengines/Kconfig
create mode 100644 drivers/net/ethernet/packetengines/Makefile
rename drivers/net/{ => ethernet/packetengines}/hamachi.c (100%)
rename drivers/net/{ => ethernet/packetengines}/yellowfin.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fd11a55..fb16747 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -624,32 +624,6 @@ config IP1000
To compile this driver as a module, choose M here: the module
will be called ipg. This is recommended.
-config HAMACHI
- tristate "Packet Engines Hamachi GNIC-II support"
- depends on PCI
- select MII
- help
- If you have a Gigabit Ethernet card of this type, say Y and read
- the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- To compile this driver as a module, choose M here. The module will be
- called hamachi.
-
-config YELLOWFIN
- tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
- depends on PCI && EXPERIMENTAL
- select CRC32
- ---help---
- Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
- adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
- used by the Beowulf Linux cluster project. See
- <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
- information about this driver in particular and Beowulf in general.
-
- To compile this driver as a module, choose M here: the module
- will be called yellowfin. This is recommended.
-
config GELIC_NET
tristate "PS3 Gigabit Ethernet driver"
depends on PPC_PS3
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 7f63be8..f473c26 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_PLIP) += plip.o
obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_R6040) += r6040.o
-obj-$(CONFIG_YELLOWFIN) += yellowfin.o
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_GELIC_NET) += ps3_gelic.o
@@ -36,7 +35,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
#
obj-$(CONFIG_SUNDANCE) += sundance.o
-obj-$(CONFIG_HAMACHI) += hamachi.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c000dc2..cf3da85 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -59,6 +59,7 @@ source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
source "drivers/net/ethernet/isa/Kconfig"
source "drivers/net/ethernet/oki/Kconfig"
+source "drivers/net/ethernet/packetengines/Kconfig"
config PASEMI_MAC
tristate "PA Semi 1/10Gbit MAC"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index d54eb3d..0c6c7a5 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_NET_ISA) += isa/
+obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_OKI) += oki/
obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
diff --git a/drivers/net/ethernet/packetengines/Kconfig b/drivers/net/ethernet/packetengines/Kconfig
new file mode 100644
index 0000000..3fa8d39
--- /dev/null
+++ b/drivers/net/ethernet/packetengines/Kconfig
@@ -0,0 +1,42 @@
+#
+# Packet engine device configuration
+#
+
+config NET_PACKET_ENGINE
+ bool "Packet Engine 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 packet engine devices. If you say Y, you will
+ be asked for your specific card in the following questions.
+
+config HAMACHI
+ tristate "Packet Engines Hamachi GNIC-II support"
+ depends on NET_PACKET_ENGINE && PCI
+ select MII
+ ---help---
+ If you have a Gigabit Ethernet card of this type, say Y and read
+ the Ethernet-HOWTO, available from
+ <http://www.tldp.org/docs.html#howto>.
+
+ To compile this driver as a module, choose M here. The module will be
+ called hamachi.
+
+config YELLOWFIN
+ tristate "Packet Engines Yellowfin Gigabit-NIC support (EXPERIMENTAL)"
+ depends on NET_PACKET_ENGINE && PCI && EXPERIMENTAL
+ select CRC32
+ ---help---
+ Say Y here if you have a Packet Engines G-NIC PCI Gigabit Ethernet
+ adapter or the SYM53C885 Ethernet controller. The Gigabit adapter is
+ used by the Beowulf Linux cluster project. See
+ <http://cesdis.gsfc.nasa.gov/linux/drivers/yellowfin.html> for more
+ information about this driver in particular and Beowulf in general.
+
+ To compile this driver as a module, choose M here: the module
+ will be called yellowfin. This is recommended.
diff --git a/drivers/net/ethernet/packetengines/Makefile b/drivers/net/ethernet/packetengines/Makefile
new file mode 100644
index 0000000..995ccd0
--- /dev/null
+++ b/drivers/net/ethernet/packetengines/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Packet Engine network device drivers.
+#
+
+obj-$(CONFIG_HAMACHI) += hamachi.o
+obj-$(CONFIG_YELLOWFIN) += yellowfin.o
diff --git a/drivers/net/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
similarity index 100%
rename from drivers/net/hamachi.c
rename to drivers/net/ethernet/packetengines/hamachi.c
diff --git a/drivers/net/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
similarity index 100%
rename from drivers/net/yellowfin.c
rename to drivers/net/ethernet/packetengines/yellowfin.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 50/72] xilinx/ll_temac: Move the Xilinx drivers
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, John Williams, David H. Lynch Jr.
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Xilinx drivers into drivers/net/ethernet/xilinx/ and
make the necessary Kconfig and Makefile changes.
CC: John Williams <john.williams@petalogix.com>
CC: "David H. Lynch Jr." <dhlii@dlasys.net>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 15 ---------
drivers/net/Makefile | 4 --
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/xilinx/Kconfig | 31 ++++++++++++++++++++
drivers/net/ethernet/xilinx/Makefile | 7 ++++
drivers/net/{ => ethernet/xilinx}/ll_temac.h | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_main.c | 0
drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c | 0
.../net/{ => ethernet/xilinx}/xilinx_emaclite.c | 0
10 files changed, 40 insertions(+), 19 deletions(-)
create mode 100644 drivers/net/ethernet/xilinx/Kconfig
create mode 100644 drivers/net/ethernet/xilinx/Makefile
rename drivers/net/{ => ethernet/xilinx}/ll_temac.h (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_main.c (100%)
rename drivers/net/{ => ethernet/xilinx}/ll_temac_mdio.c (100%)
rename drivers/net/{ => ethernet/xilinx}/xilinx_emaclite.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0e13828..05534af 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -576,13 +576,6 @@ config NET_POCKET
the questions about this class of network devices. If you say Y, you
will be asked for your specific device in the following questions.
-config XILINX_EMACLITE
- tristate "Xilinx 10/100 Ethernet Lite support"
- depends on PPC32 || MICROBLAZE
- select PHYLIB
- help
- This driver supports the 10/100 Ethernet Lite from Xilinx.
-
config LANTIQ_ETOP
tristate "Lantiq SoC ETOP driver"
depends on SOC_TYPE_XWAY
@@ -645,14 +638,6 @@ config GELIC_WIRELESS
the driver automatically distinguishes the models, you can
safely enable this option even if you have a wireless-less model.
-config XILINX_LL_TEMAC
- tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
- depends on PPC || MICROBLAZE
- select PHYLIB
- help
- This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
- core used in Xilinx Spartan and Virtex FPGAs
-
endif # NETDEV_1000
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 58d1c38..eee20c5 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -39,10 +39,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
-ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
-obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
-obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
-
obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 0ae98cb..8c57df8 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -127,5 +127,6 @@ config TSI108_ETH
will be called tsi108_eth.
source "drivers/net/ethernet/via/Kconfig"
+source "drivers/net/ethernet/xilinx/Kconfig"
endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 9b5df9f..e802591 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -51,3 +51,4 @@ obj-$(CONFIG_NET_TI) += ti/
obj-$(CONFIG_NET_TULIP) += tulip/
obj-$(CONFIG_TSI108_ETH) += tsi108_eth.o
obj-$(CONFIG_NET_VENDOR_VIA) += via/
+obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/
diff --git a/drivers/net/ethernet/xilinx/Kconfig b/drivers/net/ethernet/xilinx/Kconfig
new file mode 100644
index 0000000..d66feb1
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/Kconfig
@@ -0,0 +1,31 @@
+#
+# Xilink device configuration
+#
+
+config NET_VENDOR_XILINX
+ bool "Xilinx devices"
+ depends on PPC || PPC32 || MICROBLAZE
+ ---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 Xilinx devices. If you say Y, you will be asked
+ for your specific card in the following questions.
+
+config XILINX_EMACLITE
+ tristate "Xilinx 10/100 Ethernet Lite support"
+ depends on NET_VENDOR_XILINX && (PPC32 || MICROBLAZE)
+ select PHYLIB
+ ---help---
+ This driver supports the 10/100 Ethernet Lite from Xilinx.
+
+config XILINX_LL_TEMAC
+ tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver"
+ depends on NET_VENDOR_XILINX && (PPC || MICROBLAZE)
+ select PHYLIB
+ ---help---
+ This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
+ core used in Xilinx Spartan and Virtex FPGAs
diff --git a/drivers/net/ethernet/xilinx/Makefile b/drivers/net/ethernet/xilinx/Makefile
new file mode 100644
index 0000000..5feac73
--- /dev/null
+++ b/drivers/net/ethernet/xilinx/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Xilink network device drivers.
+#
+
+ll_temac-objs := ll_temac_main.o ll_temac_mdio.o
+obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
+obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
diff --git a/drivers/net/ll_temac.h b/drivers/net/ethernet/xilinx/ll_temac.h
similarity index 100%
rename from drivers/net/ll_temac.h
rename to drivers/net/ethernet/xilinx/ll_temac.h
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
similarity index 100%
rename from drivers/net/ll_temac_main.c
rename to drivers/net/ethernet/xilinx/ll_temac_main.c
diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ethernet/xilinx/ll_temac_mdio.c
similarity index 100%
rename from drivers/net/ll_temac_mdio.c
rename to drivers/net/ethernet/xilinx/ll_temac_mdio.c
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
similarity index 100%
rename from drivers/net/xilinx_emaclite.c
rename to drivers/net/ethernet/xilinx/xilinx_emaclite.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 49/72] jme: Move the JME driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Guo-Fu Tseng
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the JME driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 12 ------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 13 +++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/jme.c | 0
drivers/net/{ => ethernet}/jme.h | 0
7 files changed, 15 insertions(+), 14 deletions(-)
rename drivers/net/{ => ethernet}/jme.c (100%)
rename drivers/net/{ => ethernet}/jme.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 07ac87b..a0759c4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3553,7 +3553,7 @@ JME NETWORK DRIVER
M: Guo-Fu Tseng <cooldavid@cooldavid.org>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/jme.*
+F: drivers/net/ethernet/jme.*
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
M: David Woodhouse <dwmw2@infradead.org>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f4708d4..0e13828 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -653,18 +653,6 @@ config XILINX_LL_TEMAC
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
core used in Xilinx Spartan and Virtex FPGAs
-config JME
- tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
- depends on PCI
- select CRC32
- select MII
- ---help---
- This driver supports the PCI-Express gigabit ethernet adapters
- based on JMicron JMC250 chipset.
-
- To compile this driver as a module, choose M here. The module
- will be called jme.
-
endif # NETDEV_1000
#
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index a53f0b3..58d1c38 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -8,7 +8,6 @@ obj-$(CONFIG_PHYLIB) += phy/
obj-$(CONFIG_IP1000) += ipg.o
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/
#
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 7e83747..0ae98cb 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -50,6 +50,19 @@ source "drivers/net/ethernet/faraday/Kconfig"
source "drivers/net/ethernet/freescale/Kconfig"
source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
+
+config JME
+ tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
+ depends on PCI
+ select CRC32
+ select MII
+ ---help---
+ This driver supports the PCI-Express gigabit ethernet adapters
+ based on JMicron JMC250 chipset.
+
+ To compile this driver as a module, choose M here. The module
+ will be called jme.
+
source "drivers/net/ethernet/marvell/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
source "drivers/net/ethernet/micrel/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b2f51c5..9b5df9f 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
diff --git a/drivers/net/jme.c b/drivers/net/ethernet/jme.c
similarity index 100%
rename from drivers/net/jme.c
rename to drivers/net/ethernet/jme.c
diff --git a/drivers/net/jme.h b/drivers/net/ethernet/jme.h
similarity index 100%
rename from drivers/net/jme.h
rename to drivers/net/ethernet/jme.h
--
1.7.5.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox