cvs commit: src/sys/contrib/pf - Imported sources

[Max Laier]

mlaier      2004-08-12 13:46:22 UTC

  FreeBSD src repository

  src/sys/contrib/pf - Imported sources
  Update of /home/ncvs/src/sys/contrib/pf
  In directory repoman.freebsd.org:/tmp/cvs-serv24103
  
  Log Message:
  Import a couple of fixes from OpenBSD-current, which did not make -stable in
  OpenBSD for various reasons.
  
  Discussed with:	yongari
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_5_003
  		
  U src/sys/contrib/pf/net/if_pflog.c
  U src/sys/contrib/pf/net/if_pflog.h
  U src/sys/contrib/pf/net/if_pfsync.c
  U src/sys/contrib/pf/net/if_pfsync.h
  C src/sys/contrib/pf/net/pf.c
  C src/sys/contrib/pf/net/pf_if.c
  U src/sys/contrib/pf/net/pf_ioctl.c
  C src/sys/contrib/pf/net/pf_norm.c
  U src/sys/contrib/pf/net/pf_osfp.c
  U src/sys/contrib/pf/net/pf_table.c
  C src/sys/contrib/pf/net/pfvar.h
  U src/sys/contrib/pf/netinet/in4_cksum.c
  
  4 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf