cvs commit: src/share/man/man4 Makefile nfe.4 src/sys/amd64/conf NOTES src/sys/conf files.amd64 files.i386 src/sys/dev/nfe if_nfe.c if_nfereg.h if_nfevar.h src/sys/i386/conf NOTES src/sys/modules Makefile src/sys/modules/nfe Makefile

[Scott Long]

David E. O'Brien wrote:
> obrien      2006-06-26 23:41:07 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:
>     share/man/man4       Makefile 
>     sys/amd64/conf       NOTES 
>     sys/conf             files.amd64 files.i386 
>     sys/dev/nfe          if_nfe.c if_nfereg.h if_nfevar.h 
>     sys/i386/conf        NOTES 
>     sys/modules          Makefile 
>   Added files:
>     share/man/man4       nfe.4 
>     sys/modules/nfe      Makefile 
>   Log:
>   Add a pure open source nForce Ethernet driver, under BSDL.
>   This driver was ported from OpenBSD by Shigeaki Tagashira
>   <shigeaki at se.hiroshima-u.ac.jp> and posted at
>   http://www.se.hiroshima-u.ac.jp/~shigeaki/software/freebsd-nfe.html
>   It was additionally cleaned up by me.
>   It is still a work-in-progress and thus is purposefully not in GENERIC.
>   And it conflicts with nve(4), so only one should be loaded.

Does it conflict with symbols, or just with PCI Ids?  If it's just the 
latter then both can be present in the kernel, but the one with the
higher probe return value will win.

Scott