diff options
| author | luigi <luigi@FreeBSD.org> | 2011-11-22 21:50:38 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2011-11-22 21:50:38 +0000 |
| commit | ca0cc1668dc6d177f7c5e14002b48e1ed9b21d13 (patch) | |
| tree | c27d899d52f84a8f87d00521586486ef9ddafc33 | |
| parent | b5276a5d440b9f4954485149410c766095f71ba9 (diff) | |
| download | FreeBSD-src-ca0cc1668dc6d177f7c5e14002b48e1ed9b21d13.zip FreeBSD-src-ca0cc1668dc6d177f7c5e14002b48e1ed9b21d13.tar.gz | |
forgot to merge NETMAP entries in sys/conf !
| -rw-r--r-- | sys/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/conf/files | 1 | ||||
| -rw-r--r-- | sys/conf/options | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 67f3f83..1e7537a 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -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. diff --git a/sys/conf/files b/sys/conf/files index 4d98f28..3fec1c8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1507,6 +1507,7 @@ dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci 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 diff --git a/sys/conf/options b/sys/conf/options index 02b908a..12e676e 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -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 |
