summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-06-17 15:50:50 -0500
committerChris Buechler <cmb@pfsense.org>2016-06-22 00:15:43 -0500
commit6d2eeea1050115195794ae328db3f550bf0134ae (patch)
treedadcbb1253733abbb8e939388a34e4f9fd7f4661
parent1988fec31c1cadc1eaf419239a20cef49d9d3a10 (diff)
downloadFreeBSD-src-6d2eeea1050115195794ae328db3f550bf0134ae.zip
FreeBSD-src-6d2eeea1050115195794ae328db3f550bf0134ae.tar.gz
Merge fix from FreeBSD for fragment states not being removed. Ticket #6499RELENG_2_3_1
-rw-r--r--sys/netpfil/pf/pf_norm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c
index b925960..3559909 100644
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -434,7 +434,7 @@ pf_fillup_fragment(struct pf_fragment_cmp *key, struct pf_frent *frent,
*(struct pf_fragment_cmp *)frag = *key;
frag->fr_flags = 0;
- frag->fr_timeout = time_second;
+ frag->fr_timeout = time_uptime;
frag->fr_maxlen = frent->fe_len;
TAILQ_INIT(&frag->fr_queue);
OpenPOWER on IntegriCloud