diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2011-11-28 01:04:51 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2011-11-28 01:04:51 +0000 |
| commit | 4a643950db4eb34e40f6ec62e4ee776017ec0b0f (patch) | |
| tree | 97dc96cc3ae838960de88a5f83e5fb2935a59a2c /sys/net/pf.c | |
| parent | a0f186516cbc5189f93928704b768794a73d1dad (diff) | |
deprecate PFTM_UNTIL_PACKET. nothing in the tree uses it, and
pf_state_expires() handled it incorrectly.
discussed with mikeb@
ok henning@
Diffstat (limited to 'sys/net/pf.c')
| -rw-r--r-- | sys/net/pf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 40dfd890de4..30fc5a03959 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.787 2011/11/26 03:28:46 mcbride Exp $ */ +/* $OpenBSD: pf.c,v 1.788 2011/11/28 01:04:50 dlg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1062,8 +1062,6 @@ pf_state_expires(const struct pf_state *state) /* handle all PFTM_* > PFTM_MAX here */ if (state->timeout == PFTM_PURGE) return (time_second); - if (state->timeout == PFTM_UNTIL_PACKET) - return (0); KASSERT(state->timeout != PFTM_UNLINKED); KASSERT(state->timeout < PFTM_MAX); timeout = state->rule.ptr->timeout[state->timeout]; |