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>
index | next in thread | previous in thread | raw e-mail
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: > forgot to merge NETMAP entries in sys/conf ! > > Modified: > head/sys/conf/NOTES > head/sys/conf/files > head/sys/conf/options > > Modified: head/sys/conf/NOTES > ============================================================================== > --- head/sys/conf/NOTES Tue Nov 22 21:49:29 2011 (r227844) > +++ head/sys/conf/NOTES Tue Nov 22 21:50:38 2011 (r227845) > @@ -799,6 +799,12 @@ device sppp > # option. DHCP requires bpf. > device bpf > > +# The `netmap' device implements memory-mapped access to network > +# devices from userspace, enabling wire-speed packet capture and > +# generation even at 10Gbit/s. Requires support in the device > +# driver. Supported drivers are ixgbe, e1000, re. > +device netmap > + > # The `disc' device implements a minimal network interface, > # which throws away all packets sent and never receives any. It is > # included for testing and benchmarking purposes. > > Modified: head/sys/conf/files > ============================================================================== > --- head/sys/conf/files Tue Nov 22 21:49:29 2011 (r227844) > +++ head/sys/conf/files Tue Nov 22 21:50:38 2011 (r227845) > @@ -1507,6 +1507,7 @@ dev/mxge/mxge_rss_ethp_z8e.c optional mx > dev/my/if_my.c optional my > dev/ncv/ncr53c500.c optional ncv > dev/ncv/ncr53c500_pccard.c optional ncv pccard > +dev/netmap/netmap.c optional netmap > dev/nge/if_nge.c optional nge > dev/nxge/if_nxge.c optional nxge > dev/nxge/xgehal/xgehal-device.c optional nxge > > Modified: head/sys/conf/options > ============================================================================== > --- head/sys/conf/options Tue Nov 22 21:49:29 2011 (r227844) > +++ head/sys/conf/options Tue Nov 22 21:50:38 2011 (r227845) > @@ -690,6 +690,7 @@ ISAPNP opt_isa.h > > # various 'device presence' options. > DEV_BPF opt_bpf.h > +DEV_NETMAP opt_global.h > DEV_MCA opt_mca.h > DEV_CARP opt_carp.h > DEV_SPLASH 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éhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADL2u4hvq4X7CPCiUpZYqCRiXp7jP=Q=uTG6iEXzW9EZtyBXwg>