Module Name:	src
Committed By:	thorpej
Date:		Fri Jan 17 16:37:24 UTC 2003

Modified Files:
	src/sys/net [nathanw_sa]: if_ecosubr.c if_ethersubr.c if_vlan.c
	src/sys/netinet [nathanw_sa]: ip_encap.c ip_encap.h
	src/sys/netinet6 [nathanw_sa]: ipsec.c nd6.c

Log Message:
Sync with HEAD.


To generate a diff of this commit:
cvs rdiff -r1.8.2.2 -r1.8.2.3 src/sys/net/if_ecosubr.c
cvs rdiff -r1.75.2.12 -r1.75.2.13 src/sys/net/if_ethersubr.c
cvs rdiff -r1.30.2.7 -r1.30.2.8 src/sys/net/if_vlan.c
cvs rdiff -r1.4.4.7 -r1.4.4.8 src/sys/netinet/ip_encap.c
cvs rdiff -r1.1.8.1 -r1.1.8.2 src/sys/netinet/ip_encap.h
cvs rdiff -r1.33.2.12 -r1.33.2.13 src/sys/netinet6/ipsec.c
cvs rdiff -r1.42.2.11 -r1.42.2.12 src/sys/netinet6/nd6.c

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