Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 2 Nov 2007 15:24:52 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 128509 for review
Message-ID:  <200711021524.lA2FOqv4043526@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=128509

Change 128509 by rwatson@rwatson_cinnamon on 2007/11/02 15:24:47

	Integrate zero-copy BPF branch.

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/libpcap/CHANGES#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/CREDITS#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/FILES#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL#2 delete
.. //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL.txt#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/Makefile.in#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/README.dag#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/TODO#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/VERSION#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/bpf_image.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/config.h.in#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/configure#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/configure.in#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/fad-getad.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/fad-win32.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/gencode.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/gencode.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/grammar.y#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/inet.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/lbl/gnuc.h#2 delete
.. //depot/projects/zcopybpf/src/contrib/libpcap/nametoaddr.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/optimize.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/packaging/pcap.spec.in#1 branch
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#9 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dag.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-dlpi.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-int.h#5 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-linux.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-win32.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.3#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/pf.h#2 delete
.. //depot/projects/zcopybpf/src/contrib/libpcap/savefile.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/libpcap/scanner.l#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/CHANGES#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/CREDITS#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/FILES#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/INSTALL#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/Makefile.in#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/README#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/VERSION#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/addrtoname.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/af.c#1 branch
.. //depot/projects/zcopybpf/src/contrib/tcpdump/af.h#1 branch
.. //depot/projects/zcopybpf/src/contrib/tcpdump/bootp.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/config.h.in#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/configure#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/configure.in#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/dccp.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11.h#3 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/ieee802_11_radio.h#3 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/interface.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/ip.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/llc.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/nameser.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/netdissect.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/ospf.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/parsenfsfh.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/pf.h#2 delete
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-802_11.c#3 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-atm.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bfd.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bgp.c#3 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-bootp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-chdlc.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dccp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-dhcp6.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-domain.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ether.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-fddi.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-fr.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-icmp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ip6.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ipfc.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-isoclns.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-juniper.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-l2tp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lane.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ldp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-llc.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lmp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-lspping.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-nfs.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-null.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-olsr.c#1 branch
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ospf.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pflog.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pim.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-ppp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-pptp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rsvp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-rx.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sctp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-sll.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-smb.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-tcp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-tftp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-token.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/print-udp.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/smbutil.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tcp.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump-stdinc.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.1#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.c#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-capX.out#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tests/print-capXX.out#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/tftp.h#1 branch
.. //depot/projects/zcopybpf/src/contrib/tcpdump/udp.h#2 integrate
.. //depot/projects/zcopybpf/src/contrib/tcpdump/util.c#2 integrate
.. //depot/projects/zcopybpf/src/lib/libpcap/Makefile#4 integrate
.. //depot/projects/zcopybpf/src/lib/libpcap/config.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/msi.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/conf/DEFAULTS#3 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#7 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#6 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/include/pc/bios.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/amd64/isa/clock.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch
.. //depot/projects/zcopybpf/src/sys/arm/arm/identcpu.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/support.S#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/at91_mcireg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/at91rm92reg.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/kb920x_machdep.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/ohci_atmelarm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/std.at91#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/std.kb920x#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/armreg.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/asm.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/cpuconf.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/arm/include/cpufunc.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/emac_init.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/arm/at91/libat91/lib.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/ficl/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/pxe.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/loader/main.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/zcopybpf/src/sys/boot/pc98/Makefile.inc#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/pc98/boot2/boot.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/bsm/audit.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_all.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/compat/linux/linux_file.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/compat/linux/linux_getcwd.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_fcntl.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files#12 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.arm#3 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.i386#5 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.ia64#4 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.pc98#4 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.powerpc#5 integrate
.. //depot/projects/zcopybpf/src/sys/conf/files.sun4v#3 integrate
.. //depot/projects/zcopybpf/src/sys/conf/options.arm#4 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/fil.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_htable.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_lookup.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_lookup.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pool.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_pool.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_rpcb_pxy.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ipl.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_if.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_table.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/ddb/db_examine.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/ddb/db_ps.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aac/aac_cam.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_ec.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pci.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cd.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ath/if_ath_pci.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ciss/ciss.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/firewire/firewire.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/hptmv/entry.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwi.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/md/md.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_cam.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mmc/mmcsd.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.h#7 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_raid.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/if_nxge.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/build-version.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/version.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-debug.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-defs.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-list.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-os-template.h#2 delete
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xge-queue.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-config.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-device.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-event.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal-types.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/include/xgehal.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xge-osdep.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/nxge/xgell-version.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/dev/pccbb/pccbb_pci.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/puc/puc_pci.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/random/randomdev_soft.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/midi/sequencer.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/ac97_patch.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/uchcom.c#1 branch
.. //depot/projects/zcopybpf/src/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/ukbd.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/usb.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/usb_port.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#10 integrate
.. //depot/projects/zcopybpf/src/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/coda/coda_vfsops.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_devs.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/devfs/devfs_vnops.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/hpfs/hpfs_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/denode.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_fat.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_vfsops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_subr.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/portalfs/portal_vfsops.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/pseudofs/pseudofs.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/unionfs/union.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_subr.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vfsops.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/fs/unionfs/union_vnops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/geom/geom_io.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/geom/journal/g_journal.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/geom/part/g_part.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/conf/DEFAULTS#3 integrate
.. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/zcopybpf/src/sys/i386/conf/PAE#4 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/in_cksum.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/i386/i386/msi.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/clock.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/in_cksum.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/disasm/disasm.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/db_machdep.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/exception.S#4 integrate
.. //depot/projects/zcopybpf/src/sys/ia64/ia64/support.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/init_main.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_acct.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_alq.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_exit.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_idle.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_jail.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_kthread.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_linker.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_prot.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_shutdown.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_sysctl.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/link_elf.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/kern/subr_param.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sys_socket.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/syscalls.master#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sysv_msg.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/sysv_shm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_aio.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_lookup.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/kern/vfs_vnops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/libkern/arm/ffs.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/Makefile#10 integrate
.. //depot/projects/zcopybpf/src/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/zcopybpf/src/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/modules/nxge/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/sys/modules/uchcom/Makefile#1 branch
.. //depot/projects/zcopybpf/src/sys/net/bpf.c#24 integrate
.. //depot/projects/zcopybpf/src/sys/net/bpf.h#13 integrate
.. //depot/projects/zcopybpf/src/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net/ethernet.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/net/if.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_atmsubr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_bridge.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_disc.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_ethersubr.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_fwsubr.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_gif.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_loop.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_ppp.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_stf.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_tun.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/if_vlan.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net/route.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_freebsd.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_input.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ioctl.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_output.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_ap.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netatalk/ddp_input.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netatalk/ddp_output.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_pppoe.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netgraph/ng_socket.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/if_ether.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/igmp.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_divert.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_icmp.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_input.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_options.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/ip_output.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/raw_ip.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_constants.h#9 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctp_var.h#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/sctputil.h#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#10 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#9 integrate
.. //depot/projects/zcopybpf/src/sys/netinet/udp_usrreq.c#8 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/nd6.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netinet6/udp6_usrreq.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/nfs4client/nfs4_vfsops.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_socket.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_subs.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vfsops.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_serv.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/nfsserver/nfs_srvsock.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/opencrypto/crypto.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_ali.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_amd.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_amd64.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_ati.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_i810.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_intel.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_nvidia.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_sis.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agp_via.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/pci/agppriv.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/pci/intpm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#7 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/swtch.S#2 integrate
.. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/vm_machdep.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit_bsm_klib.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit_pipe.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit_syscalls.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/audit/audit_worker.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_audit.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_framework.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_inet.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_net.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_pipe.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_policy.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_posix_sem.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_process.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_socket.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_system.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_sysv_msg.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_sysv_sem.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_sysv_shm.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac/mac_vfs.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_biba/mac_biba.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_ifoff/mac_ifoff.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_lomac/mac_lomac.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_mls/mac_mls.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_none/mac_none.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_partition/mac_partition.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_portacl/mac_portacl.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_stub/mac_stub.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/security/mac_test/mac_test.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate
.. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/zcopybpf/src/sys/sys/apm.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sys/ata.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sys/kthread.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sys/linker.h#2 integrate
.. //depot/projects/zcopybpf/src/sys/sys/param.h#9 integrate
.. //depot/projects/zcopybpf/src/sys/sys/pciio.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/sys/priv.h#7 integrate
.. //depot/projects/zcopybpf/src/sys/sys/proc.h#8 integrate
.. //depot/projects/zcopybpf/src/sys/sys/sysctl.h#4 integrate
.. //depot/projects/zcopybpf/src/sys/sys/systm.h#6 integrate
.. //depot/projects/zcopybpf/src/sys/sys/vnode.h#5 integrate
.. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/ufs/ufs/ufs_vnops.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/vm/phys_pager.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/vm/swap_pager.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_map.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_mmap.c#4 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#6 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#7 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_param.h#3 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vm_zeroidle.c#5 integrate
.. //depot/projects/zcopybpf/src/sys/vm/vnode_pager.c#4 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/netstat/sctp.c#4 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate
.. //depot/projects/zcopybpf/src/usr.sbin/tcpdump/tcpdump/config.h#2 integrate

Differences ...

==== //depot/projects/zcopybpf/src/contrib/libpcap/CHANGES#2 (text+ko) ====

@@ -1,4 +1,88 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.8 2005/09/05 09:17:47 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.13 2007/09/12 22:40:04 ken Exp $ (LBL)
+
+Mon.	September 10, 2007.  ken@xelerance.com.  Summary for 0.9.8 libpcap release
+	Change build process to put public libpcap headers into pcap subir
+	DLT: Add value for IPMI IPMB packets
+	DLT: Add value for u10 Networks boards
+	Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted 
+	 libpcap files on an OS other than where the file was generated
+
+Wed.	July 23, 2007.  mcr@xelerance.com.  Summary for 0.9.7 libpcap release
+
+	FIXED version file to be 0.9.7 instead of 0.9.5.
+	added flags/configuration for cloning bpf device.
+	added DLT_MTP2_WITH_PHDR support (PPI)
+        "fix" the "memory leak" in icode_to_fcode() -- documentation bug
+        Various link-layer types, with a pseudo-header, for SITA http://www.sita.aero/
+	introduces support for the DAG ERF type TYPE_COLOR_MC_HDLC_POS.
+	Basic BPF filtering support for DLT_MTP2_WITH_PHDR is also added.
+        check for IPv4 and IPv6, even for DLT_RAW 
+	add support for DLT_JUNIPER_ISM
+  	Pick up changes from NetBSD: many from tron, christos, drochner
+	Allocate DLT_ for 802.15.4 without any header munging, for Mikko Saarnivala.
+	Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header
+
+Wed.	April 25, 2007. ken@xelerance.com.  Summary for 0.9.6 libpcap release
+
+	Put the public libpcap headers into a pcap subdirectory in both the
+	 source directory and the target include directory, and have include
+	 files at the top-level directory to include those headers, for 
+	 backwards compatibility.
+	Add Bluetooth support
+	Add USB capturing support on Linux
+	Add support for the binary USB sniffing interface in Linux
+	Add support for new FreeBSD BIOCSDIRECTION ioctl
+	Add additional filter operations for 802.11 frame types
+	Add support for filtering on MTP2 frame types
+	Propagate some changes from the main branch, so the x.9 branch has 
+	 all the DLT_ and LINKTYPE_ values that the main branch does
+	Reserved a DLT_ and SAVEFILE_ value for PPI (Per Packet Info) 
+	 encapsulated packets
+	Add LINKTYPE_ for IEEE 802.15.4, with address fields padded as done 
+	 by Linux drivers
+	Add LINKTYPE_ value corresponding to DLT_IEEE802_16_MAC_CPS.
+	Add DLT for IEEE 802.16 (WiMAX) MAC Common Part Sublayer
+	Add DLT for Bluetooth HCI UART transport layer
+	When building a shared library, build with "-fPIC" on Linux to support x86_64
+	Link with "$(CC) -shared" rather than "ld -shared" when building a 
+	 ".so" shared library
+	Add support for autoconf 2.60
+	Fixes to discard unread packets when changing filters
+	Changes to handle name changes in the DAG library resulting from 
+	 switching to libtool.
+	Add support for new DAG ERF types.
+        Add an explicit "-ldag" when building the shared library, so the DAG 
+	 library dependency is explicit.
+	Mac OSX fixes for dealing with "wlt" devices
+	Fixes in add_or_find_if() & pcap_findalldevs() to optimize generating
+	 device lists
+	Fixed a bug in pcap_open_live(). The return value of PacketSetHwFilter
+	 was not checked. 
+
+Tue.	September 19, 2006. ken@xelerance.com. Summary for 0.9.5 libpcap release
+
+	Support for LAPD frames with vISDN
+	Support for ERF on channelized T1/E1 cards via DAG API
+	Fix capitalization that caused issues crossc compiling on Linux
+	Better failure detection on PacketGetAdapterNames()
+	Fixes for MPLS packet generation (link layer)
+	OP_PACKET now matches the beginning of the packet, instead of
+	 beginning+link-layer
+	Add DLT/LINKTYPE for carrying FRF.16 Multi-link Frame Relay
+	Fix allocation of buffer for list of link-layer types  
+	Added a new DLT and LINKTYPE value for ARINC 653 Interpartition Communcation Messages
+	Fixed a typo in a DLT value: it should start with DLT_ and not LINKTYPE_
+	Redefined DLT_CAN20B and LINKTYPE_CAN20B as #190 (as this is the right value for CAN).
+	Added definition for DLT_A429 and LINKTYPE_A429 as #184.
+	Added a new DLT and LINKTYPE value for CAN v2.0B frames.
+	Add support for DLT_JUNIPER_VP.
+	Don't double-count received packets on Linux systems that 
+	 support the PACKET_STATISTICS getsockopt() argument on 
+	 PF_PACKET sockets.
+	Add support for DLT_IEEE802_11 and DLT_IEEE802_11_RADIO link 
+	 layers in Windows
+	Add support to build libpcap.lib and wpcap.dll under Cygnus and 
+	 MingW32.
 
 Mon. 	September 5, 2005.  ken@xelerance.com. Summary for 0.9.4 libpcap release
 

==== //depot/projects/zcopybpf/src/contrib/libpcap/CREDITS#2 (text+ko) ====

@@ -23,6 +23,7 @@
 	Chris G. Demetriou		<cgd@netbsd.org>
 	Chris Lightfoot			<cwrl@users.sourceforge.net>
 	Chris Pepper			<pepper@mail.reppep.com>
+	Daniele Orlandi			<daniele@orlandi.com>
 	Darren Reed			<darrenr@reed.wattle.id.au>
 	David Kaelbling			<drk@sgi.com>
 	David Young			<dyoung@ojctech.com>
@@ -31,6 +32,7 @@
 	Dug Song			<dugsong@monkey.org>
 	Eric Anderson			<anderse@hpl.hp.com>
         Erik de Castro Lopo             <erik.de.castro.lopo@sensorynetworks.com>
+	Florent Drouin			<Florent.Drouin@alcatel-lucent.fr>
 	Franz Schaefer			<schaefer@mond.at>
 	Gianluca Varenni		<varenni@netgroup-serv.polito.it>
 	Gilbert Hoyek			<gil_hoyek@hotmail.com>
@@ -50,6 +52,7 @@
 	John Bankier			<jbankier@rainfinity.com>
 	Jon Lindgren			<jonl@yubyub.net>
 	Juergen Schoenwaelder		<schoenw@ibr.cs.tu-bs.de>
+	Jung-uk Kim			<jkim@FreeBSD.org>
 	Kazushi Sugyo			<sugyo@pb.jp.nec.com>
 	Klaus Klein			<kleink@netbsd.org>
 	Koryn Grant			<koryn@endace.com>
@@ -63,12 +66,14 @@
 	Mark Pizzolato			<List-tcpdump-workers@subscriptions.pizzolato.net>
 	Martin Husemann			<martin@netbsd.org>
 	Matthew Luckie			<mjl@luckie.org.nz>
+	Max Laier			<max@love2party.net>
 	Mike Kershaw			<dragorn@kismetwireless.net>
 	Mike Wiacek			<mike@iroot.net>
 	Monroe Williams			<monroe@pobox.com>
 	Nicolas Dade			<ndade@nsd.dyndns.org>
 	Octavian Cerna			<tavy@ylabs.com>
 	Olaf Kirch			<okir@caldera.de>
+	Ollie Wild			<aaw@users.sourceforge.net>
 	Onno van der Linden		<onno@simplex.nl>
 	Patrick Marie			<mycroft@virgaria.org>
 	Paul Mundt			<lethal@linux-sh.org>
@@ -78,6 +83,7 @@
 	Peter Jeremy			<peter.jeremy@alcatel.com.au>
 	Phil Wood			<cpw@lanl.gov>
 	Rafal Maszkowski		<rzm@icm.edu.pl>
+					<rcb-isis@users.sourceforge.net>
 	Rick Jones			<raj@cup.hp.com>
 	Scott Barron			<sb125499@ohiou.edu>
 	Scott Gifford			<sgifford@tir.com>
@@ -85,6 +91,7 @@
 	Shaun Clowes			<delius@progsoc.uts.edu.au>
 	Solomon Peachy			<pizza@shaftnet.org>
 	Stefan Hudson			<hudson@mbay.net>
+	Stephen Donnelly		<stephen@endace.com>
 	Takashi Yamamoto		<yamt@mwd.biglobe.ne.jp>
         Tanaka Shin-ya                  <zstanaka@archer.livedoor.com>
 	Tony Li				<tli@procket.com>

==== //depot/projects/zcopybpf/src/contrib/libpcap/FILES#2 (text+ko) ====

@@ -97,7 +97,6 @@
 pcap.3
 pcap.c
 pcap.h
-pf.h
 ppp.h
 savefile.c
 scanner.l

==== //depot/projects/zcopybpf/src/contrib/libpcap/INSTALL.txt#2 (text+ko) ====

@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.1 2005/06/20 21:30:14 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/INSTALL.txt,v 1.12.2.2 2007/09/12 19:17:24 guy Exp $ (LBL)
 
 To build libpcap, run "./configure" (a shell script). The configure
 script will determine your system attributes and generate an
@@ -373,7 +373,6 @@
 pcap.3		- manual entry
 pcap.c		- pcap utility routines
 pcap.h		- public libpcap definitions
-pf.h		- OpenBSD DLT_PFLOG definitions
 ppp.h		- Point to Point Protocol definitions
 rawss7.h	- information on DLT_ types for SS7
 savefile.c	- offline support

==== //depot/projects/zcopybpf/src/contrib/libpcap/Makefile.in#2 (text+ko) ====

@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99 2003/12/15 01:35:03 guy Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/libpcap/Makefile.in,v 1.99.2.2 2007/07/24 02:35:15 mcr Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -46,7 +46,9 @@
 INCLS = -I. @V_INCLS@
 DEFS = @DEFS@ @V_DEFS@
 LIBS = @V_LIBS@
+DAGLIBS = @DAGLIBS@
 DYEXT = @DYEXT@
+PROG=libpcap
 
 # Standard CFLAGS
 CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
@@ -112,7 +114,7 @@
 #
 libpcap.so: $(OBJ)
 	@rm -f $@
-	ld -shared -o $@.`cat VERSION` $(OBJ)
+	$(CC) -shared -o $@.`cat VERSION` $(OBJ) $(DAGLIBS)
 
 # the following rule succeeds, but the result is untested.
 libpcap.dylib: $(OBJ)
@@ -216,19 +218,10 @@
 	RPMVERSION=`cat VERSION | sed s/-.*//g`; \
 		sed -e s/@VERSION@/$$RPMVERSION/ -e s/@NAME@/libpcap-`cat VERSION`/ $<   > $@
 
-tar: Makefile packaging/pcap.spec
-	@cwd=`pwd` ; dir=`basename $$cwd` ; name=libpcap-`cat VERSION` ; \
-	    list="" ; tar="tar chf" ; \
-	    for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \
-	    echo \
-	    "rm -f ../$$name; ln -s $$dir ../$$name" ; \
-	     rm -f ../$$name; ln -s $$dir ../$$name ; \
-	    echo \
-	    "(cd .. ; $$tar - [lots of files]) | gzip -c > /tmp/$$name.tar.gz" ; \
-	     (cd .. ; $$tar - $$list) | gzip -c > /tmp/$$name.tar.gz ; \
-	    echo \
-	    "rm -f ../$$name" ; \
-	     rm -f ../$$name
+releasetar:
+	@cwd=`pwd` ; dir=`basename $$cwd` ; name=$(PROG)-`cat VERSION` ; \
+	   list="" ; make distclean; cd ..; mkdir -p n; cd n; ln -s ../$$dir $$name; \
+	   tar -c -z -f $$name.tar.gz $$name/. ;
 
 depend:	$(GENSRC) $(GENHDR) bpf_filter.c
 	./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC)

==== //depot/projects/zcopybpf/src/contrib/libpcap/README.dag#2 (text+ko) ====

@@ -77,11 +77,32 @@
 include packets that would have been dropped by the filter). The RX stream
 buffer size is user configurable outside libpcap, typically 16-512MB.
 
-pcap_get_selectable_fd() is not supported, DAG cards do not support
+pcap_get_selectable_fd() is not supported, as DAG cards do not support
 poll/select methods.
 
 pcap_inject() and pcap_sendpacket() are not supported.
 
+Some DAG cards now support capturing to multiple virtual interfaces, called
+streams. Capture streams have even numbers. These are available via libpcap
+as separate interfaces, e.g. dag0:0, dag0:2, dag0:4 etc. dag0:0 is the same
+as dag0. These are visible via pcap_findalldevs().
+
+libpcap now does NOT set the card's hardware snaplen (slen). This must now be
+set using the appropriate DAG coniguration program, e.g. dagthree, dagfour,
+dagsix, dagconfig. This is because the snaplen is currently shared between
+all of the streams. In future this may change if per-stream slen is
+implemented.
+
+DAG cards by default capture entire packets including the L2
+CRC/FCS. If the card is not configured to discard the CRC/FCS, this
+can confuse applications that use libpcap if they're not prepared for
+packets to have an FCS. Libpcap now reads the environment variable
+ERF_FCS_BITS to determine how many bits of CRC/FCS to strip from the
+end of the captured frame. This defaults to 32 for use with
+Ethernet. If the card is configured to strip the CRC/FCS, then set
+ERF_FCS_BITS=0. If used with a HDLC/PoS/PPP/Frame Relay link with 16
+bit CRC/FCS, then set ERF_FCS_BITS=16.
+
 ----------------------------------------------------------------------
 
 Please submit bug reports via <support@endace.com>.

==== //depot/projects/zcopybpf/src/contrib/libpcap/TODO#2 (text+ko) ====

@@ -15,13 +15,6 @@
   style (okay, you can guess that by looking at the code) and a guide for
   what needs to be documented.
 
-Linux kernel interface
-
-- Currently there is a race condition in that a socket is activated at the
-  same time it is opened - before applying a filter. This has to
-  be corrected so that capture starts when pcap_read is called for the 
-  first time. 
-
 Less urgent items
 -----------------
 

==== //depot/projects/zcopybpf/src/contrib/libpcap/VERSION#2 (text+ko) ====

@@ -1,1 +1,1 @@
-0.9.4
+0.9.8

==== //depot/projects/zcopybpf/src/contrib/libpcap/bpf_image.c#2 (text+ko) ====

@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26 2003/11/15 23:23:57 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/bpf_image.c,v 1.26.2.1 2007/06/11 09:52:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,7 +43,7 @@
 	int n;
 {
 	int v;
-	char *fmt, *op;
+	const char *fmt, *op;
 	static char image[256];
 	char operand[64];
 

==== //depot/projects/zcopybpf/src/contrib/libpcap/config.h.in#2 (text+ko) ====

@@ -10,9 +10,15 @@
 /* Enable optimizer debugging */
 #undef BDEBUG
 
+/* define if you have a cloning BPF device */
+#undef HAVE_CLONING_BPF
+
 /* define if you have the DAG API */
 #undef HAVE_DAG_API
 
+/* define if you have dag_get_erf_types() */
+#undef HAVE_DAG_GET_ERF_TYPES
+
 /* define if you have streams capable DAG API */
 #undef HAVE_DAG_STREAMS_API
 
@@ -50,9 +56,15 @@
 /* Define to 1 if you have the <netinet/if_ether.h> header file. */
 #undef HAVE_NETINET_IF_ETHER_H
 
+/* Define to 1 if you have the <net/pfvar.h> header file. */
+#undef HAVE_NET_PFVAR_H
+
 /* if there's an os_proto.h */
 #undef HAVE_OS_PROTO_H
 
+/* Define to 1 if you have the <paths.h> header file. */
+#undef HAVE_PATHS_H
+
 /* define if you have a /proc/net/dev */
 #undef HAVE_PROC_NET_DEV
 

==== //depot/projects/zcopybpf/src/contrib/libpcap/configure#2 (text+ko) ====

@@ -1,37 +1,101 @@
 #! /bin/sh
-# From configure.in Revision: 1.120.2.7 .
+# From configure.in Revision: 1.120.2.13 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
+# Generated by GNU Autoconf 2.61.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711021524.lA2FOqv4043526>