* [RFC 64/72] at1700: Move the Allied Telesis driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Donald Becker, Yutaka Tamiya, Rene Schmit
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Allied Telesis driver into drivers/net/ethernet/ and
made the necessary Kconfig and Makefile changes.
CC: Donald Becker <becker@scyld.com>
CC: Yutaka Tamiya <tamy@flab.fujitsu.co.jp>
CC: Rene Schmit <rene@bss.lu>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 12 ------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 13 +++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/at1700.c | 0
5 files changed, 14 insertions(+), 13 deletions(-)
rename drivers/net/{ => ethernet}/at1700.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 2af125b..5c3505b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -320,18 +320,6 @@ config DNET
To compile this driver as a module, choose M here: the module
will be called dnet.
-config AT1700
- tristate "AT1700/1720 support (EXPERIMENTAL)"
- depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
- select CRC32
- ---help---
- 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>.
-
- To compile this driver as a module, choose M here. The module
- will be called at1700.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 13e2499..8504458 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -49,7 +49,6 @@ obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
obj-$(CONFIG_DEFXX) += defxx.o
-obj-$(CONFIG_AT1700) += at1700.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index bb4b87f..c6d61a01 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -52,6 +52,19 @@ config ARIADNE
will be called ariadne.
source "drivers/net/ethernet/arm/Kconfig"
+
+config AT1700
+ tristate "AT1700/1720 support (EXPERIMENTAL)"
+ depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
+ select CRC32
+ ---help---
+ 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>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called at1700.
+
source "drivers/net/ethernet/atheros/Kconfig"
source "drivers/net/ethernet/atmel/Kconfig"
source "drivers/net/ethernet/blackfin/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 37a5d1c..0ad9873 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_A2065) += a2065.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
+obj-$(CONFIG_AT1700) += at1700.o
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
obj-$(CONFIG_ARIADNE) += ariadne.o
diff --git a/drivers/net/at1700.c b/drivers/net/ethernet/at1700.c
similarity index 100%
rename from drivers/net/at1700.c
rename to drivers/net/ethernet/at1700.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 63/72] hp100/depca: Move the HP and Digital drivers
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Jaroslav Kysela, David Davies
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the HP and Digital drivers into drivers/net/ethernet/ and
made the necessary Kconfig and Makefile changes.
CC: Jaroslav Kysela <perex@perex.cz>
CC: David Davies <davies@maniac.ultranet.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 24 ------------------------
drivers/net/Makefile | 2 --
drivers/net/ethernet/Kconfig | 26 ++++++++++++++++++++++++++
drivers/net/ethernet/Makefile | 2 ++
drivers/net/{ => ethernet}/depca.c | 0
drivers/net/{ => ethernet}/depca.h | 0
drivers/net/{ => ethernet}/hp100.c | 0
drivers/net/{ => ethernet}/hp100.h | 0
9 files changed, 29 insertions(+), 27 deletions(-)
rename drivers/net/{ => ethernet}/depca.c (100%)
rename drivers/net/{ => ethernet}/depca.h (100%)
rename drivers/net/{ => ethernet}/hp100.c (100%)
rename drivers/net/{ => ethernet}/hp100.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 432dbfc..f4a46ef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3033,7 +3033,7 @@ F: drivers/platform/x86/tc1100-wmi.c
HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
M: Jaroslav Kysela <perex@perex.cz>
S: Maintained
-F: drivers/net/hp100.*
+F: drivers/net/ethernet/hp100.*
HPET: High Precision Event Timers driver
M: Clemens Ladisch <clemens@ladisch.de>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dcdf6e6..2af125b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -332,30 +332,6 @@ config AT1700
To compile this driver as a module, choose M here. The module
will be called at1700.
-config DEPCA
- tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
- depends on ISA || EISA || MCA
- select CRC32
- ---help---
- 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:drivers/net/depca.c>.
-
- To compile this driver as a module, choose M here. The module
- will be called depca.
-
-config HP100
- tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
- depends on ISA || EISA || PCI
- help
- 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>.
-
- To compile this driver as a module, choose M here. The module
- will be called hp100.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ae1b74d..13e2499 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -27,7 +27,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
-obj-$(CONFIG_HP100) += hp100.o
obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
@@ -51,7 +50,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_MACVTAP) += macvtap.o
obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_AT1700) += at1700.o
-obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 6ade848..bb4b87f 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -59,11 +59,37 @@ source "drivers/net/ethernet/broadcom/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/cisco/Kconfig"
+
+config DEPCA
+ tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
+ depends on ISA || EISA || MCA
+ select CRC32
+ ---help---
+ 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:drivers/net/depca.c>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called depca.
+
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"
+
+config HP100
+ tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"
+ depends on ISA || EISA || PCI
+ ---help---
+ 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>.
+
+ To compile this driver as a module, choose M here. The module
+ will be called hp100.
+
source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
source "drivers/net/ethernet/icplus/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index eef91e6..37a5d1c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -17,11 +17,13 @@ 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_DEPCA) += depca.o
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_HP100) += hp100.o
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
obj-$(CONFIG_IP1000) += icplus/
diff --git a/drivers/net/depca.c b/drivers/net/ethernet/depca.c
similarity index 100%
rename from drivers/net/depca.c
rename to drivers/net/ethernet/depca.c
diff --git a/drivers/net/depca.h b/drivers/net/ethernet/depca.h
similarity index 100%
rename from drivers/net/depca.h
rename to drivers/net/ethernet/depca.h
diff --git a/drivers/net/hp100.c b/drivers/net/ethernet/hp100.c
similarity index 100%
rename from drivers/net/hp100.c
rename to drivers/net/ethernet/hp100.c
diff --git a/drivers/net/hp100.h b/drivers/net/ethernet/hp100.h
similarity index 100%
rename from drivers/net/hp100.h
rename to drivers/net/ethernet/hp100.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 65/72] dnet: Move the Dave Ethernet driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Ilya Yanok
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Dave Ethernet driver into drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.
CC: "Dave S.r.l." <www.dave.eu>
CC: Ilya Yanok <yanok@emcraft.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 11 -----------
drivers/net/Makefile | 2 --
drivers/net/ethernet/Kconfig | 11 +++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/dnet.c | 0
drivers/net/{ => ethernet}/dnet.h | 0
6 files changed, 12 insertions(+), 13 deletions(-)
rename drivers/net/{ => ethernet}/dnet.c (100%)
rename drivers/net/{ => ethernet}/dnet.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5c3505b..59b935c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -309,17 +309,6 @@ config GRETH
help
Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-config DNET
- tristate "Dave ethernet support (DNET)"
- depends on NET_ETHERNET && HAS_IOMEM
- select PHYLIB
- help
- The Dave ethernet interface (DNET) is found on Qong Board FPGA.
- Say Y to include support for the DNET chip.
-
- To compile this driver as a module, choose M here: the module
- will be called dnet.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 8504458..4e84419 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -58,8 +58,6 @@ obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
-obj-$(CONFIG_DNET) += dnet.o
-
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
obj-$(CONFIG_TR) += tokenring/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index c6d61a01..55976aa 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -73,6 +73,17 @@ source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/chelsio/Kconfig"
source "drivers/net/ethernet/cisco/Kconfig"
+config DNET
+ tristate "Dave ethernet support (DNET)"
+ depends on HAS_IOMEM
+ select PHYLIB
+ ---help---
+ The Dave ethernet interface (DNET) is found on Qong Board FPGA.
+ Say Y to include support for the DNET chip.
+
+ To compile this driver as a module, choose M here: the module
+ will be called dnet.
+
config DEPCA
tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
depends on ISA || EISA || MCA
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 0ad9873..8800662 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -18,6 +18,7 @@ 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_DNET) += dnet.o
obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
diff --git a/drivers/net/dnet.c b/drivers/net/ethernet/dnet.c
similarity index 100%
rename from drivers/net/dnet.c
rename to drivers/net/ethernet/dnet.c
diff --git a/drivers/net/dnet.h b/drivers/net/ethernet/dnet.h
similarity index 100%
rename from drivers/net/dnet.h
rename to drivers/net/ethernet/dnet.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 67/72] greth: Move the Aeroflex Gaisler driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Kristoffer Glembo
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Mover the Aeroflex Gaisler driver into drivers/net/ethernet/aeroflex/
and make the necessary Kconfig and Makefile changes.
CC: Kristoffer Glembo <kristoffer@gaisler.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
MAINTAINERS | 2 +-
drivers/net/Kconfig | 8 --------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/aeroflex/Kconfig | 11 +++++++++++
drivers/net/ethernet/aeroflex/Makefile | 5 +++++
drivers/net/{ => ethernet/aeroflex}/greth.c | 0
drivers/net/{ => ethernet/aeroflex}/greth.h | 0
9 files changed, 19 insertions(+), 10 deletions(-)
create mode 100644 drivers/net/ethernet/aeroflex/Kconfig
create mode 100644 drivers/net/ethernet/aeroflex/Makefile
rename drivers/net/{ => ethernet/aeroflex}/greth.c (100%)
rename drivers/net/{ => ethernet/aeroflex}/greth.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f4a46ef..b86d518 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2828,7 +2828,7 @@ GRETH 10/100/1G Ethernet MAC device driver
M: Kristoffer Glembo <kristoffer@gaisler.com>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/greth*
+F: drivers/net/ethernet/aeroflex/greth*
GSPCA FINEPIX SUBDRIVER
M: Frank Zago <frank@zago.net>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 043bbf5..70ff9cc 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -291,14 +291,6 @@ config ENC28J60_WRITEVERIFY
Enable the verify after the buffer write useful for debugging purpose.
If unsure, say N.
-config GRETH
- tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
- depends on SPARC
- select PHYLIB
- select CRC32
- help
- Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 67e25a4..9c9b2ea 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DM9000) += dm9000.o
obj-$(CONFIG_ENC28J60) += enc28j60.o
-obj-$(CONFIG_GRETH) += greth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 5645609..4c18328 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -38,6 +38,7 @@ config ADAPTEC_STARFIRE
To compile this driver as a module, choose M here: the module
will be called starfire. This is recommended.
+source "drivers/net/ethernet/aeroflex/Kconfig"
source "drivers/net/ethernet/amd/Kconfig"
source "drivers/net/ethernet/apple/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 47d19fc..f2e36ba 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_A2065) += a2065.o
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
+obj-$(CONFIG_GRETH) += aeroflex/
obj-$(CONFIG_AT1700) += at1700.o
obj-$(CONFIG_NET_VENDOR_AMD) += amd/
obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
diff --git a/drivers/net/ethernet/aeroflex/Kconfig b/drivers/net/ethernet/aeroflex/Kconfig
new file mode 100644
index 0000000..f109c8c
--- /dev/null
+++ b/drivers/net/ethernet/aeroflex/Kconfig
@@ -0,0 +1,11 @@
+#
+# Aeroflex Gaisler device configuration
+#
+
+config GRETH
+ tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
+ depends on SPARC
+ select PHYLIB
+ select CRC32
+ ---help---
+ Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
diff --git a/drivers/net/ethernet/aeroflex/Makefile b/drivers/net/ethernet/aeroflex/Makefile
new file mode 100644
index 0000000..701fcd0
--- /dev/null
+++ b/drivers/net/ethernet/aeroflex/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Aeroflex Gaisler device drivers.
+#
+
+obj-$(CONFIG_GRETH) += greth.o
diff --git a/drivers/net/greth.c b/drivers/net/ethernet/aeroflex/greth.c
similarity index 100%
rename from drivers/net/greth.c
rename to drivers/net/ethernet/aeroflex/greth.c
diff --git a/drivers/net/greth.h b/drivers/net/ethernet/aeroflex/greth.h
similarity index 100%
rename from drivers/net/greth.h
rename to drivers/net/ethernet/aeroflex/greth.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 69/72] dm9000: Move the Davicom driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Ben Dooks, Sascha Hauer
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Davicom driver into drivers/net/ethernet/davicom/ and
make the necessary Kconfig and Makefile changes.
CC: Ben Dooks <ben@simtec.co.uk>
CC: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 28 ------------------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/davicom/Kconfig | 31 +++++++++++++++++++++++++++
drivers/net/ethernet/davicom/Makefile | 5 ++++
drivers/net/{ => ethernet/davicom}/dm9000.c | 0
drivers/net/{ => ethernet/davicom}/dm9000.h | 0
8 files changed, 38 insertions(+), 29 deletions(-)
create mode 100644 drivers/net/ethernet/davicom/Kconfig
create mode 100644 drivers/net/ethernet/davicom/Makefile
rename drivers/net/{ => ethernet/davicom}/dm9000.c (100%)
rename drivers/net/{ => ethernet/davicom}/dm9000.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d1bcd23..4ddc389 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -246,34 +246,6 @@ config NET_NETX
To compile this driver as a module, choose M here. The module
will be called netx-eth.
-config DM9000
- tristate "DM9000 support"
- depends on ARM || BLACKFIN || MIPS
- select CRC32
- select MII
- ---help---
- Support for DM9000 chipset.
-
- To compile this driver as a module, choose M here. The module
- will be called dm9000.
-
-config DM9000_DEBUGLEVEL
- int "DM9000 maximum debug level"
- depends on DM9000
- default 4
- help
- The maximum level of debugging code compiled into the DM9000
- driver.
-
-config DM9000_FORCE_SIMPLE_PHY_POLL
- bool "Force simple NSR based PHY polling"
- depends on DM9000
- ---help---
- This configuration forces the DM9000 to use the NSR's LinkStatus
- bit to determine if the link is up or down instead of the more
- costly MII PHY reads. Note, this will not work if the chip is
- operating with an external PHY.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b647529..83075d4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
-obj-$(CONFIG_DM9000) += dm9000.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ac88e7c..3ec1903 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -73,6 +73,7 @@ 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/davicom/Kconfig"
config DNET
tristate "Dave ethernet support (DNET)"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index afbb0ff..3b2a35a 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -19,6 +19,7 @@ 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_DM9000) += davicom/
obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig
new file mode 100644
index 0000000..0a03b0b
--- /dev/null
+++ b/drivers/net/ethernet/davicom/Kconfig
@@ -0,0 +1,31 @@
+#
+# Davicom device configuration
+#
+
+config DM9000
+ tristate "DM9000 support"
+ depends on ARM || BLACKFIN || MIPS
+ select CRC32
+ select MII
+ ---help---
+ Support for DM9000 chipset.
+
+ To compile this driver as a module, choose M here. The module
+ will be called dm9000.
+
+config DM9000_DEBUGLEVEL
+ int "DM9000 maximum debug level"
+ depends on DM9000
+ default 4
+ help
+ The maximum level of debugging code compiled into the DM9000
+ driver.
+
+config DM9000_FORCE_SIMPLE_PHY_POLL
+ bool "Force simple NSR based PHY polling"
+ depends on DM9000
+ ---help---
+ This configuration forces the DM9000 to use the NSR's LinkStatus
+ bit to determine if the link is up or down instead of the more
+ costly MII PHY reads. Note, this will not work if the chip is
+ operating with an external PHY.
diff --git a/drivers/net/ethernet/davicom/Makefile b/drivers/net/ethernet/davicom/Makefile
new file mode 100644
index 0000000..74b31f0
--- /dev/null
+++ b/drivers/net/ethernet/davicom/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Davicom device drivers.
+#
+
+obj-$(CONFIG_DM9000) += dm9000.o
diff --git a/drivers/net/dm9000.c b/drivers/net/ethernet/davicom/dm9000.c
similarity index 100%
rename from drivers/net/dm9000.c
rename to drivers/net/ethernet/davicom/dm9000.c
diff --git a/drivers/net/dm9000.h b/drivers/net/ethernet/davicom/dm9000.h
similarity index 100%
rename from drivers/net/dm9000.h
rename to drivers/net/ethernet/davicom/dm9000.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 68/72] enc28j60: Move the enc28j60 driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Claudio Lanconelli
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the enc28j60 driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Claudio Lanconelli <lanconelli.claudio@eptar.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 17 -----------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/enc28j60.c | 0
drivers/net/{ => ethernet}/enc28j60_hw.h | 0
6 files changed, 19 insertions(+), 18 deletions(-)
rename drivers/net/{ => ethernet}/enc28j60.c (100%)
rename drivers/net/{ => ethernet}/enc28j60_hw.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 70ff9cc..d1bcd23 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -274,23 +274,6 @@ config DM9000_FORCE_SIMPLE_PHY_POLL
costly MII PHY reads. Note, this will not work if the chip is
operating with an external PHY.
-config ENC28J60
- tristate "ENC28J60 support"
- depends on EXPERIMENTAL && SPI && NET_ETHERNET
- select CRC32
- ---help---
- Support for the Microchip EN28J60 ethernet chip.
-
- To compile this driver as a module, choose M here. The module will be
- called enc28j60.
-
-config ENC28J60_WRITEVERIFY
- bool "Enable write verify"
- depends on ENC28J60
- ---help---
- Enable the verify after the buffer write useful for debugging purpose.
- If unsure, say N.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 9c9b2ea..b647529 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -54,7 +54,6 @@ obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DM9000) += dm9000.o
-obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 4c18328..ac88e7c 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -100,6 +100,24 @@ config DEPCA
source "drivers/net/ethernet/dlink/Kconfig"
source "drivers/net/ethernet/emulex/Kconfig"
+
+config ENC28J60
+ tristate "ENC28J60 support"
+ depends on EXPERIMENTAL && SPI && NET_ETHERNET
+ select CRC32
+ ---help---
+ Support for the Microchip EN28J60 ethernet chip.
+
+ To compile this driver as a module, choose M here. The module will be
+ called enc28j60.
+
+config ENC28J60_WRITEVERIFY
+ bool "Enable write verify"
+ depends on ENC28J60
+ ---help---
+ Enable the verify after the buffer write useful for debugging purpose.
+ If unsure, say N.
+
source "drivers/net/ethernet/neterion/Kconfig"
source "drivers/net/ethernet/faraday/Kconfig"
source "drivers/net/ethernet/freescale/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index f2e36ba..afbb0ff 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_DNET) += dnet.o
obj-$(CONFIG_DEPCA) += depca.o
obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
+obj-$(CONFIG_ENC28J60) += enc28j60.o
obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
diff --git a/drivers/net/enc28j60.c b/drivers/net/ethernet/enc28j60.c
similarity index 100%
rename from drivers/net/enc28j60.c
rename to drivers/net/ethernet/enc28j60.c
diff --git a/drivers/net/enc28j60_hw.h b/drivers/net/ethernet/enc28j60_hw.h
similarity index 100%
rename from drivers/net/enc28j60_hw.h
rename to drivers/net/ethernet/enc28j60_hw.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 66/72] ethoc: Move the Avionic driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Thierry Reding
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Avionic driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makfile changes.
CC: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 10 ----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 11 +++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/ethoc.c | 0
5 files changed, 12 insertions(+), 11 deletions(-)
rename drivers/net/{ => ethernet}/ethoc.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 59b935c..043bbf5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -291,16 +291,6 @@ config ENC28J60_WRITEVERIFY
Enable the verify after the buffer write useful for debugging purpose.
If unsure, say N.
-config ETHOC
- tristate "OpenCores 10/100 Mbps Ethernet MAC support"
- depends on NET_ETHERNET && HAS_IOMEM && HAS_DMA
- select MII
- select PHYLIB
- select CRC32
- select BITREVERSE
- help
- Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
-
config GRETH
tristate "Aeroflex Gaisler GRETH Ethernet MAC support"
depends on SPARC
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 4e84419..67e25a4 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_VETH) += veth.o
obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DM9000) += dm9000.o
obj-$(CONFIG_ENC28J60) += enc28j60.o
-obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_GRETH) += greth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 55976aa..5645609 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -168,6 +168,17 @@ config FORCEDETH
will be called forcedeth.
source "drivers/net/ethernet/octeon/Kconfig"
+
+config ETHOC
+ tristate "OpenCores 10/100 Mbps Ethernet MAC support"
+ depends on HAS_IOMEM && HAS_DMA
+ select MII
+ select PHYLIB
+ select CRC32
+ select BITREVERSE
+ ---help---
+ Say Y here if you want to use the OpenCores 10/100 Mbps Ethernet MAC.
+
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 8800662..47d19fc 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
obj-$(CONFIG_FORCEDETH) += forcedeth.o
obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
+obj-$(CONFIG_ETHOC) += ethoc.o
obj-$(CONFIG_NET_ISA) += isa/
obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/
obj-$(CONFIG_NET_VENDOR_OKI) += oki/
diff --git a/drivers/net/ethoc.c b/drivers/net/ethernet/ethoc.c
similarity index 100%
rename from drivers/net/ethoc.c
rename to drivers/net/ethernet/ethoc.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 71/72] sh_eth: Move the Renesas SuperH driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Yoshihiro Shimoda
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the Renesas driver into drivers/net/ethernet/renesas/ and make
the necessary Kconfig and Makefile changes.
CC: Yoshihiro Shimoda <yoshihiro.shirmoda.uh@renesas.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 15 ---------------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/renesas/Kconfig | 18 ++++++++++++++++++
drivers/net/ethernet/renesas/Makefile | 5 +++++
drivers/net/{ => ethernet/renesas}/sh_eth.c | 0
drivers/net/{ => ethernet/renesas}/sh_eth.h | 0
8 files changed, 25 insertions(+), 16 deletions(-)
create mode 100644 drivers/net/ethernet/renesas/Kconfig
create mode 100644 drivers/net/ethernet/renesas/Makefile
rename drivers/net/{ => ethernet/renesas}/sh_eth.c (100%)
rename drivers/net/{ => ethernet/renesas}/sh_eth.h (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dfae2ec..07e798e 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -221,21 +221,6 @@ menuconfig NET_ETHERNET
if NET_ETHERNET
-config SH_ETH
- tristate "Renesas SuperH Ethernet support"
- depends on SUPERH && \
- (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
- CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
- CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
- select CRC32
- select MII
- select MDIO_BITBANG
- select PHYLIB
- help
- Renesas SuperH Ethernet device driver.
- This driver supporting CPUs are:
- - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c24b5ef..b9fc5a0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_ROADRUNNER) += rrunner.o
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_RIONET) += rionet.o
-obj-$(CONFIG_SH_ETH) += sh_eth.o
#
# end link order section
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index b7d8d9b..ab12ecd 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -240,6 +240,7 @@ config R6040
will be called r6040. This is recommended.
source "drivers/net/ethernet/realtek/Kconfig"
+source "drivers/net/ethernet/renesas/Kconfig"
config S6GMAC
tristate "S6105 GMAC ethernet support"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index c1a1c61..c3fa3be 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_NET_VENDOR_RADISYS) += radisys/
obj-$(CONFIG_R6040) += r6040.o
obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
+obj-$(CONFIG_SH_ETH) += renesas/
obj-$(CONFIG_S6GMAC) += s6gmac.o
obj-$(CONFIG_NET_VENDOR_SIS) += sis/
obj-$(CONFIG_SFC) += sfc/
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
new file mode 100644
index 0000000..f57ae23
--- /dev/null
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -0,0 +1,18 @@
+#
+# Renesas device configuration
+#
+
+config SH_ETH
+ tristate "Renesas SuperH Ethernet support"
+ depends on SUPERH && \
+ (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \
+ CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \
+ CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757)
+ select CRC32
+ select MII
+ select MDIO_BITBANG
+ select PHYLIB
+ ---help---
+ Renesas SuperH Ethernet device driver.
+ This driver supporting CPUs are:
+ - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
diff --git a/drivers/net/ethernet/renesas/Makefile b/drivers/net/ethernet/renesas/Makefile
new file mode 100644
index 0000000..1c278a8
--- /dev/null
+++ b/drivers/net/ethernet/renesas/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Renesas device drivers.
+#
+
+obj-$(CONFIG_SH_ETH) += sh_eth.o
diff --git a/drivers/net/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
similarity index 100%
rename from drivers/net/sh_eth.c
rename to drivers/net/ethernet/renesas/sh_eth.c
diff --git a/drivers/net/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
similarity index 100%
rename from drivers/net/sh_eth.h
rename to drivers/net/ethernet/renesas/sh_eth.h
--
1.7.5.4
^ permalink raw reply related
* [RFC 70/72] netx: Move the netx driver
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev, Sascha Hauer
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
Move the netx driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 10 ----------
drivers/net/Makefile | 1 -
drivers/net/ethernet/Kconfig | 10 ++++++++++
drivers/net/ethernet/Makefile | 1 +
drivers/net/{ => ethernet}/netx-eth.c | 0
5 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/net/{ => ethernet}/netx-eth.c (100%)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 4ddc389..dfae2ec 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -236,16 +236,6 @@ config SH_ETH
This driver supporting CPUs are:
- SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757.
-config NET_NETX
- tristate "NetX Ethernet support"
- select MII
- depends on ARCH_NETX
- help
- This is support for the Hilscher netX builtin Ethernet ports
-
- To compile this driver as a module, choose M here. The module
- will be called netx-eth.
-
config NET_PCI
bool "EISA, VLB, PCI and on board controllers"
depends on ISA || EISA || PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 83075d4..c24b5ef 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_DEFXX) += defxx.o
obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_TUN) += tun.o
obj-$(CONFIG_VETH) += veth.o
-obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_DEV_APPLETALK) += appletalk/
obj-$(CONFIG_ETHERNET) += ethernet/
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 3ec1903..b7d8d9b 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -176,6 +176,16 @@ config FEALNX
source "drivers/net/ethernet/natsemi/Kconfig"
source "drivers/net/ethernet/8390/Kconfig"
+config NET_NETX
+ tristate "NetX Ethernet support"
+ depends on ARCH_NETX
+ select MII
+ ---help---
+ This is support for the Hilscher netX builtin Ethernet ports
+
+ To compile this driver as a module, choose M here. The module
+ will be called netx-eth.
+
config FORCEDETH
tristate "nForce Ethernet support"
depends on PCI
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 3b2a35a..c1a1c61 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -42,6 +42,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/
obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/
obj-$(CONFIG_FEALNX) += fealnx.o
obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/
+obj-$(CONFIG_NET_NETX) += netx-eth.o
obj-$(CONFIG_FORCEDETH) += forcedeth.o
obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/
obj-$(CONFIG_ETHOC) += ethoc.o
diff --git a/drivers/net/netx-eth.c b/drivers/net/ethernet/netx-eth.c
similarity index 100%
rename from drivers/net/netx-eth.c
rename to drivers/net/ethernet/netx-eth.c
--
1.7.5.4
^ permalink raw reply related
* [RFC 72/72] drivers/net: Kconfig and Makefile cleanup
From: Jeff Kirsher @ 2011-06-25 13:59 UTC (permalink / raw)
To: davem; +Cc: Jeff Kirsher, netdev
In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com>
After the move of the Ethernet drivers into drivers/net/ethernet/
there was some leftover cleanup to do in the Kconfig and Makefile.
Removed the 10/100, 1000, and 10GbE Kconfig menus.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/Kconfig | 113 ------------------------------------------
drivers/net/Makefile | 4 --
drivers/net/ethernet/Kconfig | 4 ++
3 files changed, 4 insertions(+), 117 deletions(-)
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 07e798e..71a0140 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -192,119 +192,6 @@ source "drivers/net/phy/Kconfig"
source "drivers/net/ethernet/Kconfig"
-menuconfig NET_ETHERNET
- bool "Ethernet (10 or 100Mbit)"
- depends on !UML
- ---help---
- Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
- type of Local Area Network (LAN) in universities and companies.
-
- Common varieties of Ethernet are: 10BASE-2 or Thinnet (10 Mbps over
- coaxial cable, linking computers in a chain), 10BASE-T or twisted
- pair (10 Mbps over twisted pair cable, linking computers to central
- hubs), 10BASE-F (10 Mbps over optical fiber links, using hubs),
- 100BASE-TX (100 Mbps over two twisted pair cables, using hubs),
- 100BASE-T4 (100 Mbps over 4 standard voice-grade twisted pair
- cables, using hubs), 100BASE-FX (100 Mbps over optical fiber links)
- [the 100BASE varieties are also known as Fast Ethernet], and Gigabit
- Ethernet (1 Gbps over optical fiber or short copper links).
-
- If your Linux machine will be connected to an Ethernet and you have
- an Ethernet network interface card (NIC) installed in your computer,
- say Y here and read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>. You will then also have
- to say Y to the driver for your particular NIC.
-
- Note that the answer to this question won't directly affect the
- kernel: saying N will just cause the configurator to skip all
- the questions about Ethernet network cards. If unsure, say N.
-
-if NET_ETHERNET
-
-config NET_PCI
- bool "EISA, VLB, PCI and on board controllers"
- depends on ISA || EISA || PCI
- help
- This is another class of network cards which attach directly to the
- bus. If you have one of those, 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 this class of network cards. If you say Y, you
- will be asked for your specific card in the following questions. If
- you are unsure, say Y.
-
-config NET_POCKET
- bool "Pocket and portable adapters"
- depends on PARPORT
- ---help---
- Cute little network (Ethernet) devices which attach to the parallel
- port ("pocket adapters"), commonly used with laptops. If you have
- one of those, say Y and read the Ethernet-HOWTO, available from
- <http://www.tldp.org/docs.html#howto>.
-
- If you want to plug a network (or some other) card into the PCMCIA
- (or PC-card) slot of your laptop instead (PCMCIA is the standard for
- credit card size extension cards used by all modern laptops), you
- need the pcmcia-cs package (location contained in the file
- <file:Documentation/Changes>) and you can say N here.
-
- Laptop users should read the Linux Laptop home page at
- <http://www.linux-on-laptops.com/> or
- Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>.
-
- 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 this class of network devices. If you say Y, you
- will be asked for your specific device in the following questions.
-
-endif # NET_ETHERNET
-
-#
-# Gigabit Ethernet
-#
-
-menuconfig NETDEV_1000
- bool "Ethernet (1000 Mbit)"
- depends on !UML
- default y
- ---help---
- Ethernet (also called IEEE 802.3 or ISO 8802-2) is the most common
- type of Local Area Network (LAN) in universities and companies.
-
- Say Y here to get to see options for Gigabit Ethernet drivers.
- This option alone does not add any kernel code.
- Note that drivers supporting both 100 and 1000 MBit may be listed
- under "Ethernet (10 or 100MBit)" instead.
-
- If you say N, all options in this submenu will be skipped and disabled.
-
-if NETDEV_1000
-
-endif # NETDEV_1000
-
-#
-# 10 Gigabit Ethernet
-#
-
-menuconfig NETDEV_10000
- bool "Ethernet (10000 Mbit)"
- depends on !UML
- default y
- ---help---
- Say Y here to get to see options for 10 Gigabit Ethernet drivers.
- This option alone does not add any kernel code.
-
- If you say N, all options in this submenu will be skipped and disabled.
-
-if NETDEV_10000
-
-config MDIO
- tristate
-
-endif # NETDEV_10000
-
source "drivers/net/tokenring/Kconfig"
source "drivers/net/wireless/Kconfig"
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b9fc5a0..88831ed 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -13,9 +13,7 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
# link order important here
#
obj-$(CONFIG_PLIP) += plip.o
-
obj-$(CONFIG_ROADRUNNER) += rrunner.o
-
obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
obj-$(CONFIG_SKFP) += skfp/
obj-$(CONFIG_RIONET) += rionet.o
@@ -26,7 +24,6 @@ obj-$(CONFIG_RIONET) += rionet.o
obj-$(CONFIG_NET) += Space.o loopback.o
obj-$(CONFIG_NET_SB1000) += sb1000.o
-
obj-$(CONFIG_PPP) += ppp_generic.o
obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o
@@ -36,7 +33,6 @@ obj-$(CONFIG_PPP_MPPE) += ppp_mppe.o
obj-$(CONFIG_PPPOE) += pppox.o pppoe.o
obj-$(CONFIG_PPPOL2TP) += pppox.o
obj-$(CONFIG_PPTP) += pppox.o pptp.o
-
obj-$(CONFIG_SLIP) += slip.o
obj-$(CONFIG_SLHC) += slhc.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ab12ecd..2d311dc 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -159,6 +159,10 @@ config KORINA
source "drivers/net/ethernet/marvell/Kconfig"
source "drivers/net/ethernet/mellanox/Kconfig"
+
+config MDIO
+ tristate
+
source "drivers/net/ethernet/micrel/Kconfig"
source "drivers/net/ethernet/mips/Kconfig"
source "drivers/net/ethernet/motorola/Kconfig"
--
1.7.5.4
^ permalink raw reply related
* Re: [RFC 09/72] smc: Move the SMC drivers
From: Arnd Bergmann @ 2011-06-25 14:30 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, Nicolas Pitre, Donald Becker, Erik Stahlman
In-Reply-To: <1309010363-22750-10-git-send-email-jeffrey.t.kirsher@intel.com>
On Saturday 25 June 2011, Jeff Kirsher wrote:
> Moves the SMC drivers into drivers/net/ethernet/smc/ and the
> necessary Kconfig and Makefile changes. Also did some cleanup
> of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
>
> CC: Nicolas Pitre <nico@fluxnic.net>
> CC: Donald Becker <becker@scyld.com>
> CC: Erik Stahlman <erik@vt.edu>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ...
> drivers/net/{ => ethernet/smc}/epic100.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.h | 0
> drivers/net/{ => ethernet/smc}/smc91x.c | 0
> drivers/net/{ => ethernet/smc}/smc91x.h | 0
Isn't SMC (standard microsystems corporation) the company now known
as SMSC?
The comments in smc91x.c at least hint that this should be in the
same directory as the other smsc drivers.
Arnd
^ permalink raw reply
* Re: [RFC 40/72] spider_net: Move the spider_net (IBM) driver
From: Arnd Bergmann @ 2011-06-25 14:34 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, Utz Bacher, Jens Osterkamp, Ishizaki Kou
In-Reply-To: <1309010363-22750-41-git-send-email-jeffrey.t.kirsher@intel.com>
On Saturday 25 June 2011, Jeff Kirsher wrote:
> 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>
spider_net is not an IBM product, we just wrote the driver. The
chip was made by Toshiba, and they are also maintaining the driver
now.
Arnd
^ permalink raw reply
* Re: [RFC 18/72] ehea/ibm*: Move the IBM drivers
From: Oliver Hartkopp @ 2011-06-25 14:39 UTC (permalink / raw)
To: Jeff Kirsher
Cc: davem, netdev, Christoph Raisch, Alfred Arnold, Santiago Leon,
Benjamin Herrenschmidt
In-Reply-To: <1309010363-22750-19-git-send-email-jeffrey.t.kirsher@intel.com>
On 25.06.2011 15:58, Jeff Kirsher wrote:
> Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> necessary Kconfig and Makefile changes.
(..)
> 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
s/ibm_newemac/newemac/
as it is already inside a directory called ibm?
> 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
Maybe in these c/h files the 'ibm' could be removed too?
Regards,
Oliver
btw: Thanks for the cleanup. Great work!
^ permalink raw reply
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
From: Arnd Bergmann @ 2011-06-25 14:48 UTC (permalink / raw)
To: Jeff Kirsher
Cc: davem, netdev, Sriram, Vinay Hegde, Cyril Chemparathy,
Russell King, Wan ZongShun, Lennert Buytenhek, Krzysztof Halasa,
Anant Gole, Chaithrika U S
In-Reply-To: <1309010363-22750-27-git-send-email-jeffrey.t.kirsher@intel.com>
On Saturday 25 June 2011, Jeff Kirsher wrote:
> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> necessary Kconfig and Makefile changes.
> There were 4 drivers (TI Davinci & ftmac100) not in the
> drivers/net/arm/ which should have been since they are only supported
> under ARM, so they were added to the new directory structure.
>
> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> CC'ing the last 3 major contributors from TI.
It doesn't seem logical to group drivers that are used on ARM under
the architecture when the hardware is not actually made by ARM Ltd.
The MODULE_AUTHOR fields for the davinci driver list
DaVinci EMAC Maintainer: Anant Gole <anantgole@ti.com>
DaVinci EMAC Maintainer: Chaithrika U S <chaithrika@ti.com>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 33 -------
> drivers/net/Makefile | 5 -
> drivers/net/arm/Kconfig | 74 ---------------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/arm/Kconfig | 120 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/arm/Makefile | 4 +-
> drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> drivers/net/{ => ethernet}/arm/am79c961a.h | 0
I guess this should be under ethernet/amd/ since they made the chip.
> drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> drivers/net/{ => ethernet}/arm/at91_ether.h | 0
I wouldn't be surprised to see this show up in an AVR32 SoC, since
Atmel produces chips with both architectures.
> drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
TI also produces chips with the C6x architecture, which will be supported
in Linux in the future. It could well be that there is a version that
uses the davinci ethernet mac. You also have a TI directory.
> drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
maybe group that together with cs89x0 under driver/net/ethernet/cirrus/ ?
> drivers/net/{ => ethernet}/arm/ether1.c | 0
> drivers/net/{ => ethernet}/arm/ether1.h | 0
> drivers/net/{ => ethernet}/arm/ether3.c | 0
> drivers/net/{ => ethernet}/arm/ether3.h | 0
> drivers/net/{ => ethernet}/arm/etherh.c | 0
probably makes sense to keep those as ARM specific.
> drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
drivers/net/ethernet/intel/ ?
maybe driver/net/ethernet/marvell
> drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
not sure about these.
Arnd
^ permalink raw reply
* Re: [RFC 34/72] skge/sky2: Move the SysKonnect Ethernet drivers
From: Arnd Bergmann @ 2011-06-25 14:49 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, Stephen Hemminger
In-Reply-To: <1309010363-22750-35-git-send-email-jeffrey.t.kirsher@intel.com>
On Saturday 25 June 2011, Jeff Kirsher wrote:
> Move the SysKonnect Ethernet drivers into drivers/net/ethernet/syskonnect/
> and make the necessary Kconfig and Makefile changes.
>
> CC: Stephen Hemminger <shemminger@linux-foundation.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 58 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/syskonnect/Kconfig | 74 ++++++++++++++++++++++++++
> drivers/net/ethernet/syskonnect/Makefile | 6 ++
> drivers/net/{ => ethernet/syskonnect}/skge.c | 0
> drivers/net/{ => ethernet/syskonnect}/skge.h | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
Shouldn't these live together with the other Marvell drivers?
Arnd
^ permalink raw reply
* Re: [RFC 11/72] cassini/niu/sun*: Move the Sun drivers
From: Oliver Hartkopp @ 2011-06-25 14:46 UTC (permalink / raw)
To: Jeff Kirsher
Cc: davem, netdev, Sam Creasey, Adrian Sun, Benjamin Herrenscmidt
In-Reply-To: <1309010363-22750-12-git-send-email-jeffrey.t.kirsher@intel.com>
On 25.06.2011 15:58, Jeff Kirsher wrote:
> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
> the necessary Kconfig and Makefile changes.
>
(..)
> ---
> MAINTAINERS | 1 +
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 11 +---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sun/Kconfig | 91 +++++++++++++++++++++++++++
> drivers/net/ethernet/sun/Makefile | 12 ++++
> drivers/net/{ => ethernet/sun}/cassini.c | 0
> drivers/net/{ => ethernet/sun}/cassini.h | 0
> drivers/net/{ => ethernet/sun}/niu.c | 0
> drivers/net/{ => ethernet/sun}/niu.h | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.c | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.h | 0
s/sun3_// in filenames?
> drivers/net/{ => ethernet/sun}/sunbmac.c | 0
> drivers/net/{ => ethernet/sun}/sunbmac.h | 0
> drivers/net/{ => ethernet/sun}/sungem.c | 0
> drivers/net/{ => ethernet/sun}/sungem.h | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
> drivers/net/{ => ethernet/sun}/sunhme.c | 0
> drivers/net/{ => ethernet/sun}/sunhme.h | 0
> drivers/net/{ => ethernet/sun}/sunqe.c | 0
> drivers/net/{ => ethernet/sun}/sunqe.h | 0
> drivers/net/{ => ethernet/sun}/sunvnet.c | 0
> drivers/net/{ => ethernet/sun}/sunvnet.h | 0
s/sun// in filenames?
Regards,
Oliver
^ permalink raw reply
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
From: Arnd Bergmann @ 2011-06-25 14:50 UTC (permalink / raw)
To: Jeff Kirsher
Cc: davem, netdev, Sriram, Vinay Hegde, Cyril Chemparathy,
Russell King, Wan ZongShun, Lennert Buytenhek, Krzysztof Halasa,
Anant Gole, Chaithrika U S
In-Reply-To: <201106251648.03574.arnd@arndb.de>
On Saturday 25 June 2011, Arnd Bergmann wrote:
> > drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> > drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
>
> not sure about these.
Actually, you do have a directory for Micrel, so you you put
ks8695net.c together with ks88*.c.
Arnd
^ permalink raw reply
* Re: [RFC 52/72] ps3_gelic*: Move the Sony (PS3) drivers
From: Arnd Bergmann @ 2011-06-25 14:54 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, Geoff Levand
In-Reply-To: <1309010363-22750-53-git-send-email-jeffrey.t.kirsher@intel.com>
On Saturday 25 June 2011, Jeff Kirsher wrote:
>
> Move the Sony drivers into drivers/net/ethernet/sony/ and
> make the necessary Kconfig and Makefile changes.
>
> TODO: separate the wired and wireless drivers and relocate the wireless
> dirver into drivers/net/wireless/
>
> CC: Geoff Levand <geoff@infradead.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This one is the same hardware as spider_net, just with the PS3 hypervisor
layer inbetween. I'd suggest moving that to a Toshiba directory as well.
Arnd
^ permalink raw reply
* Re: [RFC 55/72] bfin_mac: Move the Blackfin driver
From: Arnd Bergmann @ 2011-06-25 14:57 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev, Michael Hennerich
In-Reply-To: <1309010363-22750-56-git-send-email-jeffrey.t.kirsher@intel.com>
On Saturday 25 June 2011, Jeff Kirsher wrote:
>
> Move the Blackfin driver into drivers/net/ethernet/blackfin/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Michael Hennerich <michael.hennerich@analog.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> ---
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 46 -----------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/blackfin/Kconfig | 65 ++++++++++++++++++++++++
> drivers/net/ethernet/blackfin/Makefile | 5 ++
> drivers/net/{ => ethernet/blackfin}/bfin_mac.c | 0
> drivers/net/{ => ethernet/blackfin}/bfin_mac.h | 0
Since you are sorting by company, I'd suggest making the directory
analog, not blackfin, which is just the CPU architecture.
Arnd
^ permalink raw reply
* Re: [RFC 18/72] ehea/ibm*: Move the IBM drivers
From: Arnd Bergmann @ 2011-06-25 15:04 UTC (permalink / raw)
To: Oliver Hartkopp
Cc: Jeff Kirsher, davem, netdev, Christoph Raisch, Alfred Arnold,
Santiago Leon, Benjamin Herrenschmidt
In-Reply-To: <4E05F320.1080202@hartkopp.net>
On Saturday 25 June 2011, Oliver Hartkopp wrote:
> > 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
>
> s/ibm_newemac/newemac/
>
> as it is already inside a directory called ibm?
>
You can probably rename to just emac now, since the "old" emac driver
has been gone for some time.
The "new" part of the name does not refer to the hardware, just to
the driver.
Arnd
^ permalink raw reply
* Re: [AX25] inconsistent lock state
From: f6bvp @ 2011-06-25 15:51 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Ralf Baechle, linux-kernel, Linux Netdev List, linux-hams
In-Reply-To: <201106171611.10655.arnd@arndb.de>
Hi,
I applied the patch and since then I could not reproduce the
inconsistent lock state.
Thus mkiss patch fixed it.
Thanks,
Bernard
Le 17/06/2011 16:11, Arnd Bergmann a écrit :
> On Friday 17 June 2011 15:51:48 Ralf Baechle wrote:
>> On Fri, Jun 17, 2011 at 03:36:15PM +0200, Arnd Bergmann wrote:
>>
>> (Removed Jarek from cc; his email bounces.)
>>
>>> The message hints that disc_data_lock is aquired with softirqs disabled,
>>> but does not itself disable softirqs, which can in rare circumstances
>>> lead to a deadlock.
>>>
>>> Does this fix it?
>> If so, drivers/net/hamradio.c, function sp_get() would probably need the
>> equivalent fix. Same for drivers/net/ppp_async.c:ap_get() and sp_get() in
>> drivers/net/ppp_synctty.c.
> It seems that ppp_synctty.c is ok, it uses write_lock_irq() already,
> sixpack.c looks like it has the same bug as mkiss. I also realized
> after sending out the patch that only the write_lock needs to be
> changed to write_lock_bh, while read_lock can leave softirqs enabled
> because it can be called recursively.
>
> Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-hams" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
From: Russell King - ARM Linux @ 2011-06-25 15:53 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
Krzysztof Halasa, Anant Gole, Chaithrika U S
In-Reply-To: <201106251648.03574.arnd@arndb.de>
On Sat, Jun 25, 2011 at 04:48:03PM +0200, Arnd Bergmann wrote:
> On Saturday 25 June 2011, Jeff Kirsher wrote:
> > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > necessary Kconfig and Makefile changes.
> > There were 4 drivers (TI Davinci & ftmac100) not in the
> > drivers/net/arm/ which should have been since they are only supported
> > under ARM, so they were added to the new directory structure.
> >
> > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > CC'ing the last 3 major contributors from TI.
>
> It doesn't seem logical to group drivers that are used on ARM under
> the architecture when the hardware is not actually made by ARM Ltd.
ARM doesn't make any silicon hardware itself, so by that argument it
shouldn't be in a directory called 'arm' at all.
However, what the 'arm' in drivers/net/arm is referring to is that
the drivers are solely used with stuff associated with arch/arm, not
that there's any connection with ARM Ltd.
^ permalink raw reply
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
From: Arnd Bergmann @ 2011-06-25 16:03 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
Krzysztof Halasa, Anant Gole, Chaithrika U S
In-Reply-To: <20110625155356.GI23234@n2100.arm.linux.org.uk>
On Saturday 25 June 2011, Russell King - ARM Linux wrote:
> On Sat, Jun 25, 2011 at 04:48:03PM +0200, Arnd Bergmann wrote:
> > On Saturday 25 June 2011, Jeff Kirsher wrote:
> > > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > > necessary Kconfig and Makefile changes.
> > > There were 4 drivers (TI Davinci & ftmac100) not in the
> > > drivers/net/arm/ which should have been since they are only supported
> > > under ARM, so they were added to the new directory structure.
> > >
> > > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > > CC'ing the last 3 major contributors from TI.
> >
> > It doesn't seem logical to group drivers that are used on ARM under
> > the architecture when the hardware is not actually made by ARM Ltd.
>
> ARM doesn't make any silicon hardware itself, so by that argument it
> shouldn't be in a directory called 'arm' at all.
>
> However, what the 'arm' in drivers/net/arm is referring to is that
> the drivers are solely used with stuff associated with arch/arm, not
> that there's any connection with ARM Ltd.
Yes, I understand that about the current state, but Jeff's series
of patches moves all network drivers around to directories based on
manufacturer, so it's going to be less logical after all the other
drivers are moved, especially when he already creates drivers
for AMD, TI, atmel, cirrus and micrel.
Arnd
^ permalink raw reply
* Re: [RFC 02/72] 3c*/acenic/typhoon: Move 3Com Ethernet drivers
From: David Dillow @ 2011-06-25 16:11 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: davem, netdev
In-Reply-To: <1309010363-22750-3-git-send-email-jeffrey.t.kirsher@intel.com>
On Sat, 2011-06-25 at 06:58 -0700, Jeff Kirsher wrote:
> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
> Kconfig and Makefile changes.
> CC: David Dillow <dave@thedillows.org>
> drivers/net/{ => ethernet/3com}/typhoon.c | 0
> drivers/net/{ => ethernet/3com}/typhoon.h | 0
For what it's worth:
Acked-by: David Dillow <dave@thedillows.org>
^ permalink raw reply
* Re: [RFC 26/72] arm: Move the ARM/ACORN drivers
From: Russell King - ARM Linux @ 2011-06-25 16:12 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jeff Kirsher, davem, netdev, Sriram, Vinay Hegde,
Cyril Chemparathy, Wan ZongShun, Lennert Buytenhek,
Krzysztof Halasa, Anant Gole, Chaithrika U S
In-Reply-To: <201106251803.53416.arnd@arndb.de>
On Sat, Jun 25, 2011 at 06:03:53PM +0200, Arnd Bergmann wrote:
> On Saturday 25 June 2011, Russell King - ARM Linux wrote:
> > On Sat, Jun 25, 2011 at 04:48:03PM +0200, Arnd Bergmann wrote:
> > > On Saturday 25 June 2011, Jeff Kirsher wrote:
> > > > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > > > necessary Kconfig and Makefile changes.
> > > > There were 4 drivers (TI Davinci & ftmac100) not in the
> > > > drivers/net/arm/ which should have been since they are only supported
> > > > under ARM, so they were added to the new directory structure.
> > > >
> > > > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > > > CC'ing the last 3 major contributors from TI.
> > >
> > > It doesn't seem logical to group drivers that are used on ARM under
> > > the architecture when the hardware is not actually made by ARM Ltd.
> >
> > ARM doesn't make any silicon hardware itself, so by that argument it
> > shouldn't be in a directory called 'arm' at all.
> >
> > However, what the 'arm' in drivers/net/arm is referring to is that
> > the drivers are solely used with stuff associated with arch/arm, not
> > that there's any connection with ARM Ltd.
>
> Yes, I understand that about the current state, but Jeff's series
> of patches moves all network drivers around to directories based on
> manufacturer, so it's going to be less logical after all the other
> drivers are moved, especially when he already creates drivers
> for AMD, TI, atmel, cirrus and micrel.
How do you deal with NE2K or 8390 stuff, where you have a design which
has been cloned by many different manufacturers? Who's do you decide
to put it in?
More interestingly, if you have one of the 8390 clones, which directory
do you look in? And shouldn't etherh.c live along side 8390's files
as etherh is 8390-derived?
ether1 is 82586, so presumably that should be Intel subdirectory.
ether3 is SEEQ8005, so that should be in the SEEQ subdirectory.
^ permalink raw reply
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