svn commit: r257619 - head/sys/netpfil/pf
Gleb Smirnoff
glebius at FreeBSD.org
Mon Nov 4 08:16:01 UTC 2013
Author: glebius
Date: Mon Nov 4 08:15:59 2013
New Revision: 257619
URL: http://svnweb.freebsd.org/changeset/base/257619
Log:
Remove unused PFTM_UNTIL_PACKET const.
Modified:
head/sys/netpfil/pf/pf.c
head/sys/netpfil/pf/pf.h
head/sys/netpfil/pf/pf_ioctl.c
Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c Mon Nov 4 06:00:12 2013 (r257618)
+++ head/sys/netpfil/pf/pf.c Mon Nov 4 08:15:59 2013 (r257619)
@@ -1435,8 +1435,6 @@ pf_state_expires(const struct pf_state *
/* handle all PFTM_* > PFTM_MAX here */
if (state->timeout == PFTM_PURGE)
return (time_uptime);
- if (state->timeout == PFTM_UNTIL_PACKET)
- return (0);
KASSERT(state->timeout != PFTM_UNLINKED,
("pf_state_expires: timeout == PFTM_UNLINKED"));
KASSERT((state->timeout < PFTM_MAX),
Modified: head/sys/netpfil/pf/pf.h
==============================================================================
--- head/sys/netpfil/pf/pf.h Mon Nov 4 06:00:12 2013 (r257618)
+++ head/sys/netpfil/pf/pf.h Mon Nov 4 08:15:59 2013 (r257619)
@@ -68,8 +68,7 @@ enum { PFTM_TCP_FIRST_PACKET, PFTM_TCP_O
PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE,
PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL,
PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE,
- PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED,
- PFTM_UNTIL_PACKET };
+ PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED };
/* PFTM default values */
#define PFTM_TCP_FIRST_PACKET_VAL 120 /* First TCP packet */
Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c Mon Nov 4 06:00:12 2013 (r257618)
+++ head/sys/netpfil/pf/pf_ioctl.c Mon Nov 4 08:15:59 2013 (r257619)
@@ -1686,8 +1686,7 @@ relock_DIOCKILLSTATES:
struct pfioc_state *ps = (struct pfioc_state *)addr;
struct pfsync_state *sp = &ps->state;
- if (sp->timeout >= PFTM_MAX &&
- sp->timeout != PFTM_UNTIL_PACKET) {
+ if (sp->timeout >= PFTM_MAX) {
error = EINVAL;
break;
}
More information about the svn-src-all
mailing list