et131x: Promote staging et131x driver to drivers/net
Subsystems (4)
Mark Einon
maintainerPATCH 1/1 et131x: Promote staging et131x driver to drivers/net
This patch moves the et131x gigabit ethernet driver from drivers/staging to drivers/net/ethernet/agere.
---
This patch appiles to both staging-next and the linux-next tag next-20140930, and takes into account all feedback recieved from the recent RFC for this patch.
MAINTAINERS | 10 +++----
drivers/net/ethernet/Kconfig | 1 +
drivers/net/ethernet/Makefile | 1 +
drivers/net/ethernet/agere/Kconfig | 31 ++++++++++++++++++++++
.../et131x => net/ethernet/agere}/Makefile | 0
.../et131x => net/ethernet/agere}/et131x.c | 0
.../et131x => net/ethernet/agere}/et131x.h | 0
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/et131x/Kconfig | 10 -------
drivers/staging/et131x/README | 15 -----------
11 files changed, 38 insertions(+), 33 deletions(-)
create mode 100644 drivers/net/ethernet/agere/Kconfig
rename drivers/{staging/et131x => net/ethernet/agere}/Makefile (100%)
rename drivers/{staging/et131x => net/ethernet/agere}/et131x.c (100%)
rename drivers/{staging/et131x => net/ethernet/agere}/et131x.h (100%)
delete mode 100644 drivers/staging/et131x/Kconfig
delete mode 100644 drivers/staging/et131x/READMEMAINTAINERS +5 -5
@@ -3572,6 +3572,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git F: drivers/video/fbdev/s1d13xxxfb.c F: include/video/s1d13xxxfb.h +ET131X NETWORK DRIVER +M: Mark Einon <[email protected]> +S: Odd Fixes +F: drivers/net/ethernet/agere/ + ETHERNET BRIDGE M: Stephen Hemminger <[email protected]> L: [email protected]
@@ -8764,11 +8769,6 @@ M: H Hartley Sweeten <[email protected]> S: Odd Fixes F: drivers/staging/comedi/ -STAGING - ET131X NETWORK DRIVER -M: Mark Einon <[email protected]> -S: Odd Fixes -F: drivers/staging/et131x/ - STAGING - FLARION FT1000 DRIVERS M: Marek Belisko <[email protected]> S: Odd Fixes
drivers/net/ethernet/Kconfig +1 -0
@@ -20,6 +20,7 @@ config SUNGEM_PHY source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/adaptec/Kconfig" source "drivers/net/ethernet/aeroflex/Kconfig" +source "drivers/net/ethernet/agere/Kconfig" source "drivers/net/ethernet/allwinner/Kconfig" source "drivers/net/ethernet/alteon/Kconfig" source "drivers/net/ethernet/altera/Kconfig"
drivers/net/ethernet/Makefile +1 -0
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ obj-$(CONFIG_GRETH) += aeroflex/ +obj-$(CONFIG_NET_VENDOR_AGERE) += agere/ obj-$(CONFIG_NET_VENDOR_ALLWINNER) += allwinner/ obj-$(CONFIG_NET_VENDOR_ALTEON) += alteon/ obj-$(CONFIG_ALTERA_TSE) += altera/
drivers/net/ethernet/agere/Kconfig new file +31 -0
@@ -0,0 +1,31 @@ +# +# Agere device configuration +# + +config NET_VENDOR_AGERE + bool "Agere devices" + default y + 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 Agere devices. If you say Y, you will be asked + for your specific card in the following questions. + +if NET_VENDOR_AGERE + +config ET131X + tristate "Agere ET-1310 Gigabit Ethernet support" + depends on PCI + select PHYLIB + ---help--- + This driver supports Agere ET-1310 ethernet adapters. + + To compile this driver as a module, choose M here. The module + will be called et131x. + +endif # NET_VENDOR_AGERE
drivers/net/ethernet/agere/Makefile renamed from drivers/staging/et131x/Makefile +0 -0
drivers/net/ethernet/agere/et131x.c renamed from drivers/staging/et131x/et131x.c +0 -0
drivers/net/ethernet/agere/et131x.h renamed from drivers/staging/et131x/et131x.h +0 -0
drivers/staging/Kconfig +0 -2
@@ -24,8 +24,6 @@ menuconfig STAGING if STAGING -source "drivers/staging/et131x/Kconfig" - source "drivers/staging/slicoss/Kconfig" source "drivers/staging/wlan-ng/Kconfig"
drivers/staging/Makefile +0 -1
@@ -4,7 +4,6 @@ obj-$(CONFIG_STAGING) += staging.o obj-y += media/ -obj-$(CONFIG_ET131X) += et131x/ obj-$(CONFIG_SLICOSS) += slicoss/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_COMEDI) += comedi/
drivers/staging/et131x/Kconfig deleted +0 -10
@@ -1,10 +0,0 @@ -config ET131X - tristate "Agere ET-1310 Gigabit Ethernet support" - depends on PCI && NET && NETDEVICES - select PHYLIB - default n - ---help--- - This driver supports Agere ET-1310 ethernet adapters. - - To compile this driver as a module, choose M here. The module - will be called et131x.
drivers/staging/et131x/README deleted +0 -15
@@ -1,15 +0,0 @@ -This is a driver for the ET1310 network device. - -Based on the driver found at https://sourceforge.net/projects/et131x/ - -Cleaned up immensely by Olaf Hartman and Christoph Hellwig <[email protected]> - -Note, the powermanagement options were removed from the vendor provided -driver as they did not build properly at the time. - -TODO: - -Please send patches to: - Greg Kroah-Hartman <[email protected]> - Mark Einon <[email protected]> -
Signature · 1 line
2.1.0
Greg KH
maintainerQuoted 20 lines · Mark Einon
This patch moves the et131x gigabit ethernet driver from
drivers/stagingtodrivers/net/ethernet/agere.Signed-off-by Mark Einon <[email protected]>---
This patch appiles to both staging-next and the linux-next tag next-20140930, and takes into account all feedback recieved from the recent RFC for this patch.
MAINTAINERS | 10 +++---- drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/agere/Kconfig | 31 ++++++++++++++++++++++ .../et131x => net/ethernet/agere}/Makefile | 0 .../et131x => net/ethernet/agere}/et131x.c | 0 .../et131x => net/ethernet/agere}/et131x.h | 0 drivers/staging/Kconfig | 2 -- drivers/staging/Makefile | 1 - drivers/staging/et131x/Kconfig | 10 -------
Quoted 8 lines
drivers/staging/et131x/README | 15 -----------
11 files changed, 38 insertions(+), 33 deletions(-)
create mode 100644 drivers/net/ethernet/agere/Kconfig
rename drivers/{staging/et131x => net/ethernet/agere}/Makefile (100%)
rename drivers/{staging/et131x => net/ethernet/agere}/et131x.c (100%)
rename drivers/{staging/et131x => net/ethernet/agere}/et131x.h (100%)
delete mode 100644 drivers/staging/et131x/Kconfig
delete mode 100644 drivers/staging/et131x/READMEThis is a fine way to make a patch, but it's no way that any of the netdev developers could ever review it to know what the code happens to look like in my staging-next branch :(
How about just sending a patch that adds the driver to drivers/net/... Don't worry about the staging driver at the moment. If it gets added to drivers/net we can then delete the staging driver.
Sound easier? Should make the patches half as big.
thanks,
greg k-h
Quoted 10 lines · Greg KH
This is a fine way to make a patch, but it's no way that any of the netdev developers could ever review it to know what the code happens to look like in my staging-next branch :(
How about just sending a patch that adds the driver to
drivers/net/... Don't worry about the staging driver at the moment. If it gets added todrivers/netwe can then delete the staging driver.Sound easier? Should make the patches half as big.
Sounds resonable, will do.
Cheers,
Mark