summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2014-01-22 10:18:25 +0000
committerglebius <glebius@FreeBSD.org>2014-01-22 10:18:25 +0000
commit5da449f113544b238255af43099c652d5600d9a4 (patch)
treed0b73c6ee41e3f9368ac4c2c148101ec17646e7e /sys/net
parent34e36d17064eae7dd69a87cc0596d0625fc8d05f (diff)
downloadFreeBSD-src-5da449f113544b238255af43099c652d5600d9a4.zip
FreeBSD-src-5da449f113544b238255af43099c652d5600d9a4.tar.gz
Merge several fixlets from head:
r257619: Remove unused PFTM_UNTIL_PACKET const. r257620: Code logic of handling PFTM_PURGE into pf_find_state(). r258475: Don't compare unsigned <= 0. r258477: Fix off by ones when scanning source nodes hash.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/pfvar.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index c16591b..419246e 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -78,8 +78,7 @@ enum { PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED,
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 */
OpenPOWER on IntegriCloud