]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 532c491) | patch
Resolve conflicts created during the import of pf 3.7 Some features are
authorMax Laier <mlaier@FreeBSD.org>
Tue, 3 May 2005 16:43:32 +0000 (16:43 +0000)
committerMax Laier <mlaier@FreeBSD.org>
Tue, 3 May 2005 16:43:32 +0000 (16:43 +0000)
commitb01933e6bf90b35ba467ac88917f46cc3676b371
treec89a2417dc919aa1ce54db59627c344530c85d79tree | snapshot
parent532c491b2bbc9e47b6655cadfff6cd556cd62fb9commit | diff
Resolve conflicts created during the import of pf 3.7 Some features are
missing and will be implemented in a second step.  This is functional as is.

Tested by: freebsd-pf, pfsense.org
Obtained from: OpenBSD
X-MFC after: never (breaks API/ABI)
sys/contrib/pf/net/if_pflog.c diff | blob | history
sys/contrib/pf/net/if_pflog.h diff | blob | history
sys/contrib/pf/net/if_pfsync.c diff | blob | history
sys/contrib/pf/net/if_pfsync.h diff | blob | history
sys/contrib/pf/net/pf.c diff | blob | history
sys/contrib/pf/net/pf_if.c diff | blob | history
sys/contrib/pf/net/pf_ioctl.c diff | blob | history
sys/contrib/pf/net/pf_norm.c diff | blob | history
sys/contrib/pf/net/pf_osfp.c diff | blob | history
sys/contrib/pf/net/pf_table.c diff | blob | history
sys/contrib/pf/net/pfvar.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.