| Message ID | 1312082850-24914-12-git-send-email-jeffrey.t.kirsher@intel.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi, On Sat, Jul 30, 2011 at 08:26:30PM -0700, Jeff Kirsher wrote: > Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and > make the necessary Kconfig and Makefile changes. Acked-by: Andreas Mohr <andi@lisas.de> --- Sorry, I had intended to reply to the original RFC, but due to vacation backlog that got swept under the rug. Since it's a simple move it seems to be fine. One minor nit, however: since ni5210 (as seen in some other patch) got moved to its respective NON-racal location (due to using a specific chipset), a short Kconfig addition explaining the whereabouts of ni5210 (and perhaps some other OEM chipset Racal cards?) would be useful. Thank you for the probably long overdue cleanup of drivers/net/ into something more specific and thus much more easy on the eye :) Andreas Mohr -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, 2011-07-31 at 09:57 -0700, Andreas Mohr wrote: > Hi, > > On Sat, Jul 30, 2011 at 08:26:30PM -0700, Jeff Kirsher wrote: > > Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and > > make the necessary Kconfig and Makefile changes. > > Acked-by: Andreas Mohr <andi@lisas.de> > > --- > > Sorry, I had intended to reply to the original RFC, > but due to vacation backlog that got swept under the rug. > > Since it's a simple move it seems to be fine. > > One minor nit, however: since ni5210 (as seen in some other patch) > got moved to its respective NON-racal location (due to using a specific > chipset), > a short Kconfig addition explaining the whereabouts of ni5210 > (and perhaps some other OEM chipset Racal cards?) would be useful. Sounds good, would you be up for sending my a patch against my tree and I can fold it into my current patchset? Or do you want to just send a patch later on? I know what your intention is, I am just not sure how you would like it to show up in the Kconfig. My git tree with this patch series applied is: git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-organize > > Thank you for the probably long overdue cleanup of drivers/net/ > into something more specific and thus much more easy on the eye :) Thanks, it is nice to hear. > > Andreas Mohr
diff --git a/MAINTAINERS b/MAINTAINERS index b423be0..e922c04 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4494,7 +4494,7 @@ M: Jan-Pascal van Best <janpascal@vanbest.org> M: Andreas Mohr <andi@lisas.de> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ni5010.* +F: drivers/net/ethernet/racal/ni5010.* NILFS2 FILESYSTEM M: KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d7d0b35..b76de82 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -581,31 +581,6 @@ config GRETH help Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. -config NET_VENDOR_RACAL - bool "Racal-Interlan (Micom) NI cards" - depends on ISA - help - If you have a network (Ethernet) card belonging to this class, such - as the NI5010, 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 NI cards. If you say Y, you will be asked for - your specific card in the following questions. - -config NI5010 - tristate "NI5010 support (EXPERIMENTAL)" - depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP - ---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>. Note that this is still - experimental code. - - To compile this driver as a module, choose M here. The module - will be called ni5010. - config DNET tristate "Dave ethernet support (DNET)" depends on NET_ETHERNET && HAS_IOMEM diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 49b3e87..e641f70 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -140,7 +140,6 @@ obj-$(CONFIG_8139TOO) += 8139too.o obj-$(CONFIG_CPMAC) += cpmac.o obj-$(CONFIG_EWRK3) += ewrk3.o obj-$(CONFIG_ATP) += atp.o -obj-$(CONFIG_NI5010) += ni5010.o obj-$(CONFIG_SC92031) += sc92031.o obj-$(CONFIG_ETH16I) += eth16i.o diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index d0a8fa8..7efbb7c 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -19,6 +19,7 @@ source "drivers/net/ethernet/chelsio/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" +source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/smsc/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 6d3276a..86da8b8 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -10,4 +10,5 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ +obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig new file mode 100644 index 0000000..713c33e --- /dev/null +++ b/drivers/net/ethernet/racal/Kconfig @@ -0,0 +1,28 @@ +# +# Racal-Interlan device configuration +# + +config NET_VENDOR_RACAL + bool "Racal-Interlan (Micom) NI devices" + depends on ISA + ---help--- + If you have a network (Ethernet) card belonging to this class, such + as the NI5010, NI5210 or NI6210, 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 NI cards. If you say Y, you will be asked for + your specific card in the following questions. + +config NI5010 + tristate "NI5010 support (EXPERIMENTAL)" + depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP + ---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>. Note that this is still + experimental code. + + To compile this driver as a module, choose M here. The module + will be called ni5010. diff --git a/drivers/net/ethernet/racal/Makefile b/drivers/net/ethernet/racal/Makefile new file mode 100644 index 0000000..1e210ca --- /dev/null +++ b/drivers/net/ethernet/racal/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Racal-Interlan network device drivers. +# + +obj-$(CONFIG_NI5010) += ni5010.o
Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and make the necessary Kconfig and Makefile changes. CC: "Jan-Pascal van Best" <janpascal@vanbest.org> CC: Andreas Mohr <andi@lisas.de> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- MAINTAINERS | 2 +- drivers/net/Kconfig | 25 ------------------------- drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/racal/Kconfig | 28 ++++++++++++++++++++++++++++ drivers/net/ethernet/racal/Makefile | 5 +++++ drivers/net/{ => ethernet/racal}/ni5010.c | 0 drivers/net/{ => ethernet/racal}/ni5010.h | 0 9 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 drivers/net/ethernet/racal/Kconfig create mode 100644 drivers/net/ethernet/racal/Makefile rename drivers/net/{ => ethernet/racal}/ni5010.c (100%) rename drivers/net/{ => ethernet/racal}/ni5010.h (100%) diff --git a/drivers/net/ni5010.c b/drivers/net/ethernet/racal/ni5010.c similarity index 100% rename from drivers/net/ni5010.c rename to drivers/net/ethernet/racal/ni5010.c diff --git a/drivers/net/ni5010.h b/drivers/net/ethernet/racal/ni5010.h similarity index 100% rename from drivers/net/ni5010.h rename to drivers/net/ethernet/racal/ni5010.h