Date: Wed, 30 Nov 2011 13:57:07 +0100 From: =?ISO-8859-1?Q?Ren=E9_Ladan?= <rene@freebsd.org> To: Luigi Rizzo <luigi@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227845 - head/sys/conf Message-ID: <CADL2u4hvq4X7CPCiUpZYqCRiXp7jP=Q=uTG6iEXzW9EZtyBXwg@mail.gmail.com> In-Reply-To: <201111222150.pAMLocBJ011385@svn.freebsd.org> References: <201111222150.pAMLocBJ011385@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
2011/11/22 Luigi Rizzo <luigi@freebsd.org>: > Author: luigi > Date: Tue Nov 22 21:50:38 2011 > New Revision: 227845 > URL: http://svn.freebsd.org/changeset/base/227845 > > Log: > =A0forgot to merge NETMAP entries in sys/conf ! > > Modified: > =A0head/sys/conf/NOTES > =A0head/sys/conf/files > =A0head/sys/conf/options > > Modified: head/sys/conf/NOTES > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/conf/NOTES Tue Nov 22 21:49:29 2011 =A0 =A0 =A0 =A0(r227844) > +++ head/sys/conf/NOTES Tue Nov 22 21:50:38 2011 =A0 =A0 =A0 =A0(r227845) > @@ -799,6 +799,12 @@ device =A0 =A0 =A0 =A0 =A0 =A0 sppp > =A0# =A0option. =A0DHCP requires bpf. > =A0device =A0 =A0 =A0 =A0 bpf > > +# =A0The `netmap' device implements memory-mapped access to network > +# =A0devices from userspace, enabling wire-speed packet capture and > +# =A0generation even at 10Gbit/s. Requires support in the device > +# =A0driver. Supported drivers are ixgbe, e1000, re. > +device =A0 =A0 =A0 =A0 netmap > + > =A0# =A0The `disc' device implements a minimal network interface, > =A0# =A0which throws away all packets sent and never receives any. =A0It = is > =A0# =A0included for testing and benchmarking purposes. > > Modified: head/sys/conf/files > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/conf/files Tue Nov 22 21:49:29 2011 =A0 =A0 =A0 =A0(r227844) > +++ head/sys/conf/files Tue Nov 22 21:50:38 2011 =A0 =A0 =A0 =A0(r227845) > @@ -1507,6 +1507,7 @@ dev/mxge/mxge_rss_ethp_z8e.c =A0 =A0 =A0optional mx > =A0dev/my/if_my.c =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 optional my > =A0dev/ncv/ncr53c500.c =A0 =A0 =A0 =A0 =A0 =A0optional ncv > =A0dev/ncv/ncr53c500_pccard.c =A0 =A0 optional ncv pccard > +dev/netmap/netmap.c =A0 =A0 =A0 =A0 =A0 =A0optional netmap > =A0dev/nge/if_nge.c =A0 =A0 =A0 =A0 =A0 =A0 =A0 optional nge > =A0dev/nxge/if_nxge.c =A0 =A0 =A0 =A0 =A0 =A0 optional nxge > =A0dev/nxge/xgehal/xgehal-device.c =A0 =A0 =A0 =A0optional nxge > > Modified: head/sys/conf/options > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/conf/options =A0 =A0 =A0 Tue Nov 22 21:49:29 2011 =A0 =A0 = =A0 =A0(r227844) > +++ head/sys/conf/options =A0 =A0 =A0 Tue Nov 22 21:50:38 2011 =A0 =A0 = =A0 =A0(r227845) > @@ -690,6 +690,7 @@ ISAPNP =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0opt= _isa.h > > =A0# various 'device presence' options. > =A0DEV_BPF =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0opt_bpf.h > +DEV_NETMAP =A0 =A0 =A0 =A0 =A0 =A0 opt_global.h > =A0DEV_MCA =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0opt_mca.h > =A0DEV_CARP =A0 =A0 =A0 =A0 =A0 =A0 =A0 opt_carp.h > =A0DEV_SPLASH =A0 =A0 =A0 =A0 =A0 =A0 opt_splash.h I just noticed that head/sys/dev/netmap/head.diff still contains these patches, so now it won't apply cleanly any longer. Speaking of which, is there an ETA for the rest of this patch? Regards, Ren=E9
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADL2u4hvq4X7CPCiUpZYqCRiXp7jP=Q=uTG6iEXzW9EZtyBXwg>