svn commit: r300552 - stable/10/sys/netpfil/pf

[Kristof Provost]

Author: kp
Date: Tue May 24 02:44:44 2016
New Revision: 300552
URL: https://svnweb.freebsd.org/changeset/base/300552

Log:
  MFC 300307:
  
  pf: Fix fragment timeout
  
  We were inconsistent about the use of time_second vs. time_uptime.
  Always use time_uptime so the value can be meaningfully compared.
  
  Submitted by:	"Max" <maximos at als.nnov.ru>

Modified:
  stable/10/sys/netpfil/pf/pf_norm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/pf/pf_norm.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_norm.c	Tue May 24 01:42:21 2016	(r300551)
+++ stable/10/sys/netpfil/pf/pf_norm.c	Tue May 24 02:44:44 2016	(r300552)
@@ -434,7 +434,7 @@ pf_fillup_fragment(struct pf_fragment_cm
 
 		*(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);