| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <522C1DF17AF50042AD8AE87F7887BD3D01E30ABE98@exch.hq.tensilica.com>
Date: Sat, 25 Jun 2011 10:21:37 -0700
From: Marc Gauthier <marc@...silica.com>
To: Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
"davem@...emloft.net" <davem@...emloft.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
Harald Welte <laforge@...monks.org>,
Tim Hockin <thockin@...kin.org>,
"linux-ns83820@...ck.org" <linux-ns83820@...ck.org>,
Kevin Chea <kchea@...oo.com>,
Marc Gauthier <marc@...ux-xtensa.org>,
Chris Zankel <chris@...kel.net>
Subject: RE: [RFC 24/72] *sonic/natsemi/ns83829: Move the National
Semi-conductor drivers
Jeff Kirsher wrote:
> Move the National Semi-conductor drivers into
> drivers/net/ethernet/natsemi/
> and make the necessary Kconfig and Makefile changes. Also
> moved the 8390
> (National Semi-conductor) devices as a sub-menu of National
> Semi-conductor devices.
>
> CC: Thomas Bogendoerfer <tsbogend@...ha.franken.de>
> CC: Harald Welte <laforge@...monks.org>
> CC: Tim Hockin <thockin@...kin.org>
> CC: <linux-ns83820@...ck.org>
> CC: Kevin Chea <kchea@...oo.com>
> CC: Marc Gauthier <marc@...ux-xtensa.org>
> CC: Chris Zankel <chris@...kel.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@...el.com> ---
Acked-by: Marc Gauthier <marc@...silica.com>
-Marc
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 47
> ------------------ drivers/net/Makefile |
> 6 -- drivers/net/ethernet/8390/Kconfig | 7 ++-
> drivers/net/ethernet/Kconfig | 3 +-
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/natsemi/Kconfig | 63
> ++++++++++++++++++++++++ drivers/net/ethernet/natsemi/Makefile
> | 9 +++ drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
> drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.h | 0
> drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
> 15 files changed, 81 insertions(+), 59 deletions(-)
> create mode 100644 drivers/net/ethernet/natsemi/Kconfig
> create mode 100644 drivers/net/ethernet/natsemi/Makefile
> rename drivers/net/{ => ethernet/natsemi}/jazzsonic.c (100%)
> rename drivers/net/{ => ethernet/natsemi}/macsonic.c (100%)
> rename drivers/net/{ => ethernet/natsemi}/natsemi.c (100%)
> rename drivers/net/{ => ethernet/natsemi}/ns83820.c (100%)
> rename drivers/net/{ => ethernet/natsemi}/sonic.c (100%)
> rename drivers/net/{ => ethernet/natsemi}/sonic.h (100%)
> rename drivers/net/{ => ethernet/natsemi}/xtsonic.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 6f822c6..76e60e4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -4281,7 +4281,7 @@ F: drivers/net/ethernet/myricom/myri10ge/
> NATSEMI ETHERNET DRIVER (DP8381x)
> M: Tim Hockin <thockin@...kin.org>
> S: Maintained
> -F: drivers/net/natsemi.c
> +F: drivers/net/ethernet/natsemi/natsemi.c
>
> NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER
> M: Daniel Mack <zonque@...il.com>
> @@ -5852,7 +5852,7 @@ SONIC NETWORK DRIVER
> M: Thomas Bogendoerfer <tsbogend@...ha.franken.de>
> L: netdev@...r.kernel.org S: Maintained
> -F: drivers/net/sonic.*
> +F: drivers/net/ethernet/natsemi/sonic.*
>
> SONICS SILICON BACKPLANE DRIVER (SSB)
> M: Michael Buesch <mb@...sch.de>
> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
> index 56c963a..305b8b9 100644
> --- a/drivers/net/Kconfig
> +++ b/drivers/net/Kconfig
> @@ -258,19 +258,6 @@ config A2065
> To compile this driver as a module, choose M here: the module
> will be called a2065.
>
> -config MACSONIC
> - tristate "Macintosh SONIC based ethernet (onboard,
> NuBus, LC, CS)"
> - depends on MAC
> - ---help---
> - Support for NatSemi SONIC based Ethernet devices.
> This includes
> - the onboard Ethernet in many Quadras as well as some LC-PDS,
> - a few Nubus and all known Comm Slot Ethernet cards.
> If you have
> - one of these 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 macsonic.
> -
> config MVME16x_NET
> tristate "MVME16x Ethernet support"
> depends on MVME16x
> @@ -310,19 +297,6 @@ config KORINA
> If you have a Mikrotik RouterBoard 500 or IDT RC32434
> based system say Y. Otherwise say N.
>
> -config MIPS_JAZZ_SONIC
> - tristate "MIPS JAZZ onboard SONIC Ethernet support"
> - depends on MACH_JAZZ
> - help
> - This is the driver for the onboard card of MIPS Magnum 4000,
> - Acer PICA, Olivetti M700-10 and a few other identical
> OEM systems.
> -
> -config XTENSA_XT2000_SONIC
> - tristate "Xtensa XT2000 onboard SONIC Ethernet support"
> - depends on XTENSA_PLATFORM_XT2000
> - help
> - This is the driver for the onboard card of the Xtensa
> XT2000 board.
> -
> config MIPS_AU1X00_ENET
> tristate "MIPS AU1000 Ethernet support"
> depends on MIPS_ALCHEMY
> @@ -789,17 +763,6 @@ config FEALNX
> Say Y here to support the Myson MTD-800 family of
> PCI-based Ethernet
> cards. <http://www.myson.com.tw/>
>
> -config NATSEMI
> - tristate "National Semiconductor DP8381x series PCI
> Ethernet support"
> - depends on NET_PCI && PCI
> - select CRC32
> - help
> - This driver is for the National Semiconductor DP83810 series,
> - which is used in cards from PureData, NetGear, Linksys
> - and others, including the 83815 chip.
> - More specific information and updates are available from
> - <http://www.scyld.com/network/natsemi.html>.
> -
> config 8139CP
> tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter
> support (EXPERIMENTAL)"
> depends on NET_PCI && PCI && EXPERIMENTAL
> @@ -1220,16 +1183,6 @@ config IP1000
>
> source "drivers/net/ixp2000/Kconfig"
>
> -config NS83820
> - tristate "National Semiconductor DP83820 support"
> - depends on PCI
> - help
> - This is a driver for the National Semiconductor DP83820 series
> - of gigabit ethernet MACs. Cards using this chipset include
> - the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
> - SOHO-GA2000T, SOHO-GA2500T. The driver supports the use of
> - zero copy.
> -
> config HAMACHI
> tristate "Packet Engines Hamachi GNIC-II support" depends on PCI
> diff --git a/drivers/net/Makefile b/drivers/net/Makefile
> index 9ac99cd..04d7613 100644
> --- a/drivers/net/Makefile
> +++ b/drivers/net/Makefile
> @@ -45,8 +45,6 @@ obj-$(CONFIG_SIS900) += sis900.o
> obj-$(CONFIG_R6040) += r6040.o
> obj-$(CONFIG_YELLOWFIN) += yellowfin.o
> obj-$(CONFIG_ISERIES_VETH) += iseries_veth.o
> -obj-$(CONFIG_NATSEMI) += natsemi.o
> -obj-$(CONFIG_NS83820) += ns83820.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
> @@ -141,13 +139,11 @@ obj-$(CONFIG_LP486E) += lp486e.o
> obj-$(CONFIG_ETH16I) += eth16i.o
> obj-$(CONFIG_EQUALIZER) += eql.o
> obj-$(CONFIG_KORINA) += korina.o
> -obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
> obj-$(CONFIG_MIPS_AU1X00_ENET) += au1000_eth.o
> 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_MACSONIC) += macsonic.o
> obj-$(CONFIG_TUN) += tun.o
> obj-$(CONFIG_VETH) += veth.o
> obj-$(CONFIG_NET_NETX) += netx-eth.o
> @@ -163,8 +159,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o
> obj-$(CONFIG_GRETH) += greth.o
> obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o
>
> -obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
> -
> obj-$(CONFIG_DNET) += dnet.o
> obj-$(CONFIG_MACB) += macb.o
> obj-$(CONFIG_S6GMAC) += s6gmac.o
> diff --git a/drivers/net/ethernet/8390/Kconfig
> b/drivers/net/ethernet/8390/Kconfig
> index db03f52..0d82137 100644
> --- a/drivers/net/ethernet/8390/Kconfig
> +++ b/drivers/net/ethernet/8390/Kconfig
> @@ -4,9 +4,10 @@
>
> config NET_VENDOR_8390
> bool "National Semi-conductor 8390 devices"
> - depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA
>>> EISA || \
> - MAC || M32R || MACH_TX49XX || MCA_LEGACY ||
> H8300 || \
> - ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL
> + depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI
>>> SUPERH || \
> + ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
> + MCA_LEGACY || H8300 || ARM || MIPS || ZORRO
>>> PCMCIA || \
> + EXPERIMENTAL)
> ---help---
> If you have a network (Ethernet) card belonging to
> this class, say Y
> and read the Ethernet-HOWTO, available from
> diff --git a/drivers/net/ethernet/Kconfig
> b/drivers/net/ethernet/Kconfig
> index 28b473b..704e664 100644
> --- a/drivers/net/ethernet/Kconfig
> +++ b/drivers/net/ethernet/Kconfig
> @@ -12,7 +12,6 @@ menuconfig ETHERNET
> 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"
> @@ -25,6 +24,8 @@ source "drivers/net/ethernet/ibm/Kconfig"
> source "drivers/net/ethernet/intel/Kconfig"
> source "drivers/net/ethernet/mellanox/Kconfig"
> source "drivers/net/ethernet/myricom/Kconfig"
> +source "drivers/net/ethernet/natsemi/Kconfig"
> +source "drivers/net/ethernet/8390/Kconfig"
>
> config PASEMI_MAC
> tristate "PA Semi 1/10Gbit MAC"
> diff --git a/drivers/net/ethernet/Makefile
> b/drivers/net/ethernet/Makefile
> index 40dded7..e5c02d9 100644
> --- a/drivers/net/ethernet/Makefile
> +++ b/drivers/net/ethernet/Makefile
> @@ -16,6 +16,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_NET_VENDOR_NATSEMI) += natsemi/
> obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o pasemi_mac_ethtool.o
> obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
> obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
> diff --git a/drivers/net/ethernet/natsemi/Kconfig
> b/drivers/net/ethernet/natsemi/Kconfig
> new file mode 100644
> index 0000000..dc1852b
> --- /dev/null
> +++ b/drivers/net/ethernet/natsemi/Kconfig
> @@ -0,0 +1,63 @@
> +#
> +# National Semi-conductor device configuration
> +#
> +
> +config NET_VENDOR_NATSEMI
> + bool "National Semi-conductor devices"
> + depends on MAC || MACH_JAZZ || PCI || XTENSA_PLATFORM_XT2000
> + ---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 National Semi-conductor devices.
> If you say Y,
> + you will be asked for your specific card in the
> following questions.
> +
> +config MACSONIC
> + tristate "Macintosh SONIC based ethernet (onboard,
> NuBus, LC, CS)"
> + depends on NET_VENDOR_NATSEMI && MAC
> + ---help---
> + Support for NatSemi SONIC based Ethernet devices.
> This includes
> + the onboard Ethernet in many Quadras as well as some LC-PDS,
> + a few Nubus and all known Comm Slot Ethernet cards.
> If you have
> + one of these 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 macsonic.
> +
> +config MIPS_JAZZ_SONIC
> + tristate "MIPS JAZZ onboard SONIC Ethernet support"
> + depends on NET_VENDOR_NATSEMI && MACH_JAZZ
> + ---help---
> + This is the driver for the onboard card of MIPS Magnum 4000,
> + Acer PICA, Olivetti M700-10 and a few other identical
> OEM systems.
> +
> +config NATSEMI
> + tristate "National Semiconductor DP8381x series PCI
> Ethernet support"
> + depends on NET_VENDOR_NATSEMI && PCI
> + select CRC32
> + ---help---
> + This driver is for the National Semiconductor DP83810 series,
> + which is used in cards from PureData, NetGear, Linksys
> + and others, including the 83815 chip.
> + More specific information and updates are available from
> + <http://www.scyld.com/network/natsemi.html>.
> +
> +config NS83820
> + tristate "National Semiconductor DP83820 support"
> + depends on NET_VENDOR_NATSEMI && PCI
> + ---help---
> + This is a driver for the National Semiconductor DP83820 series
> + of gigabit ethernet MACs. Cards using this chipset include
> + the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,
> + SOHO-GA2000T, SOHO-GA2500T. The driver supports the use of +
> zero copy. +
> +config XTENSA_XT2000_SONIC
> + tristate "Xtensa XT2000 onboard SONIC Ethernet support"
> + depends on NET_VENDOR_NATSEMI && XTENSA_PLATFORM_XT2000 + ---help---
> + This is the driver for the onboard card of the Xtensa
> XT2000 board.
> diff --git a/drivers/net/ethernet/natsemi/Makefile
> b/drivers/net/ethernet/natsemi/Makefile
> new file mode 100644
> index 0000000..764c532
> --- /dev/null
> +++ b/drivers/net/ethernet/natsemi/Makefile
> @@ -0,0 +1,9 @@
> +#
> +# Makefile for the National Semi-conductor Sonic devices. +#
> +
> +obj-$(CONFIG_MACSONIC) += macsonic.o
> +obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o
> +obj-$(CONFIG_NATSEMI) += natsemi.o
> +obj-$(CONFIG_NS83820) += ns83820.o
> +obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o
> diff --git a/drivers/net/jazzsonic.c
> b/drivers/net/ethernet/natsemi/jazzsonic.c
> similarity index 100%
> rename from drivers/net/jazzsonic.c
> rename to drivers/net/ethernet/natsemi/jazzsonic.c
> diff --git a/drivers/net/macsonic.c
> b/drivers/net/ethernet/natsemi/macsonic.c
> similarity index 100%
> rename from drivers/net/macsonic.c
> rename to drivers/net/ethernet/natsemi/macsonic.c
> diff --git a/drivers/net/natsemi.c
> b/drivers/net/ethernet/natsemi/natsemi.c
> similarity index 100%
> rename from drivers/net/natsemi.c
> rename to drivers/net/ethernet/natsemi/natsemi.c
> diff --git a/drivers/net/ns83820.c
> b/drivers/net/ethernet/natsemi/ns83820.c
> similarity index 100%
> rename from drivers/net/ns83820.c
> rename to drivers/net/ethernet/natsemi/ns83820.c
> diff --git a/drivers/net/sonic.c
> b/drivers/net/ethernet/natsemi/sonic.c
> similarity index 100%
> rename from drivers/net/sonic.c
> rename to drivers/net/ethernet/natsemi/sonic.c
> diff --git a/drivers/net/sonic.h
> b/drivers/net/ethernet/natsemi/sonic.h
> similarity index 100%
> rename from drivers/net/sonic.h
> rename to drivers/net/ethernet/natsemi/sonic.h
> diff --git a/drivers/net/xtsonic.c
> b/drivers/net/ethernet/natsemi/xtsonic.c
> similarity index 100%
> rename from drivers/net/xtsonic.c
> rename to drivers/net/ethernet/natsemi/xtsonic.c
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists