Module Name:	src
Committed By:	liamjfoy
Date:		Thu May 18 09:05:52 UTC 2006

Modified Files:
	src/distrib/sets/lists/comp: mi
	src/distrib/sets/lists/man: mi
	src/etc: protocols
	src/sbin/ifconfig: Makefile ifconfig.8 ifconfig.c
	src/share/man/man4: Makefile
	src/sys/conf: files
	src/sys/net: if.c if.h if_bridge.c if_ethersubr.c if_fddisubr.c
	    if_media.h if_tokensubr.c if_types.h
	src/sys/netinet: Makefile if_arp.c if_inarp.h in.h in_proto.c
	src/sys/netinet6: in6.c in6_ifattach.c in6_proto.c in6_var.h nd6.c
	    nd6_nbr.c
	src/sys/sys: sockio.h
	src/usr.bin/netstat: inet.c main.c netstat.h
Added Files:
	src/sbin/ifconfig: carp.c carp.h
	src/share/man/man4: carp.4
	src/sys/netinet: ip_carp.c ip_carp.h

Log Message:
Integrate Common Address Redundancy Procotol (CARP) from OpenBSD

'pseudo-device	carp'

Thanks to: joerg@ christos@ riz@ and others who tested
Ok: core@


To generate a diff of this commit:
cvs rdiff -r1.883 -r1.884 src/distrib/sets/lists/comp/mi
cvs rdiff -r1.891 -r1.892 src/distrib/sets/lists/man/mi
cvs rdiff -r1.14 -r1.15 src/etc/protocols
cvs rdiff -r1.29 -r1.30 src/sbin/ifconfig/Makefile
cvs rdiff -r0 -r1.1 src/sbin/ifconfig/carp.c src/sbin/ifconfig/carp.h
cvs rdiff -r1.82 -r1.83 src/sbin/ifconfig/ifconfig.8
cvs rdiff -r1.170 -r1.171 src/sbin/ifconfig/ifconfig.c
cvs rdiff -r1.386 -r1.387 src/share/man/man4/Makefile
cvs rdiff -r0 -r1.1 src/share/man/man4/carp.4
cvs rdiff -r1.774 -r1.775 src/sys/conf/files
cvs rdiff -r1.165 -r1.166 src/sys/net/if.c
cvs rdiff -r1.115 -r1.116 src/sys/net/if.h
cvs rdiff -r1.37 -r1.38 src/sys/net/if_bridge.c
cvs rdiff -r1.132 -r1.133 src/sys/net/if_ethersubr.c
cvs rdiff -r1.60 -r1.61 src/sys/net/if_fddisubr.c
cvs rdiff -r1.44 -r1.45 src/sys/net/if_media.h
cvs rdiff -r1.36 -r1.37 src/sys/net/if_tokensubr.c
cvs rdiff -r1.24 -r1.25 src/sys/net/if_types.h
cvs rdiff -r1.14 -r1.15 src/sys/netinet/Makefile
cvs rdiff -r1.109 -r1.110 src/sys/netinet/if_arp.c
cvs rdiff -r1.36 -r1.37 src/sys/netinet/if_inarp.h
cvs rdiff -r1.75 -r1.76 src/sys/netinet/in.h
cvs rdiff -r1.71 -r1.72 src/sys/netinet/in_proto.c
cvs rdiff -r0 -r1.1 src/sys/netinet/ip_carp.c src/sys/netinet/ip_carp.h
cvs rdiff -r1.102 -r1.103 src/sys/netinet6/in6.c
cvs rdiff -r1.64 -r1.65 src/sys/netinet6/in6_ifattach.c
cvs rdiff -r1.62 -r1.63 src/sys/netinet6/in6_proto.c
cvs rdiff -r1.43 -r1.44 src/sys/netinet6/in6_var.h
cvs rdiff -r1.101 -r1.102 src/sys/netinet6/nd6.c
cvs rdiff -r1.63 -r1.64 src/sys/netinet6/nd6_nbr.c
cvs rdiff -r1.23 -r1.24 src/sys/sys/sockio.h
cvs rdiff -r1.68 -r1.69 src/usr.bin/netstat/inet.c
cvs rdiff -r1.51 -r1.52 src/usr.bin/netstat/main.c
cvs rdiff -r1.32 -r1.33 src/usr.bin/netstat/netstat.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.