diff options
| author | Cedric Berger <cedric@cvs.openbsd.org> | 2004-01-05 12:54:48 +0000 |
|---|---|---|
| committer | Cedric Berger <cedric@cvs.openbsd.org> | 2004-01-05 12:54:48 +0000 |
| commit | d4f411e9eeeeab7e50df14afcd69e6070f82dce4 (patch) | |
| tree | fbaa1ab90b2109fb8921f746dacc5a69725667ff | |
| parent | 00311d4ddff4e307eeb24b52dc6ccf16e0378e66 (diff) | |
Repair merge errors. Thanks Pyun YongHyeon, Sorry Henning :)
| -rw-r--r-- | sys/net/pf_ioctl.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 15ff41b7d42..4d425806ac3 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,7 +1,8 @@ -/* $OpenBSD: pf_ioctl.c,v 1.98 2003/12/31 22:14:42 deraadt Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.99 2004/01/05 12:54:47 cedric Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier + * Copyright (c) 2002,2003 Henning Brauer * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -1230,7 +1231,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) pf_purge_expired_states(); pf_status.states = 0; splx(s); +#if NPFSYNC pfsync_clear_states(pf_status.hostid); +#endif break; } |