fec_8xx driver take 2 (+ethtool)
Your patch is acceptable and OK to apply, but time has moved forward and there is a trivial rejection:
[jgarzik@sata fec]$ BK_USER=panto BK_HOST=intracom.gr bk import -tpatch -CR "-y[netdrvr] add fec_8xx driver" ~/tmp/patch . Patching...
Patch failed. **** patch log follows ****
Patching file drivers/net/Kconfig
Patching file drivers/net/Makefile
Creating file drivers/net/fec_8xx/Kconfig
Creating file drivers/net/fec_8xx/Makefile
Creating file drivers/net/fec_8xx/fec_8xx-netta.c
Creating file drivers/net/fec_8xx/fec_8xx.h
Creating file drivers/net/fec_8xx/fec_main.c
Creating file drivers/net/fec_8xx/fec_mii.c
Patching file include/asm-ppc/8xx_immap.h
1 out of 1 hunk FAILED -- saving rejects to file include/asm-ppc/8xx_immap.h.rej
Please resubmit TWO emails, one with fec_8xx patch, and another with ethtool patch.
See Documentation/SubmittingPatches for more info.
Jeff
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
And here is the ethtool patch...
Regards
Pantelis
Makefile.am +1 -1
@@ -5,7 +5,7 @@ sbin_PROGRAMS = ethtool ethtool_SOURCES = de2104x.c ethtool.c ethtool-copy.h ethtool-util.h natsemi.c \ - e1000.c realtek.c e100.c tg3.c amd8111e.c + e1000.c realtek.c e100.c tg3.c amd8111e.c fec_8xx.c dist-hook: cp $(top_srcdir)/ethtool.spec $(distdir)
ethtool-util.h +3 -0
@@ -33,4 +33,7 @@/* Advanced Micro Devices AMD8111 based Adapter */ int amd8111e_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs); +/* Motorola 8xx FEC Ethernet controller */ +int fec_8xx_dump_regs (struct ethtool_drvinfo *info,struct ethtool_regs *regs); +#endif
ethtool.c +2 -0
@@ -998,6 +998,8 @@return e100_dump_regs (info, regs);if (!strncmp ("amd8111e" , info->driver,ETHTOOL_BUSINFO_LEN ))return amd8111e_dump_regs (info, regs); +if (!strncmp ("fec_8xx" , info->driver,ETHTOOL_BUSINFO_LEN )) +return fec_8xx_dump_regs (info, regs);fprintf (stdout,"Offset\tValue\n" );
fec_8xx.c +81 -0
81 lines not on this page · raw message
Jeff Garzik
Appliedapplied
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/
Jeff Garzik
Appliedapplied
** Sent via the linuxppc-embedded mail list. See http://lists.linuxppc.org/