patch-1.3.14 linux/net/ipv4/ip.c

• Lines: 27
• Date: Mon Jul 31 09:46:27 1995
• Orig file: v1.3.13/linux/net/ipv4/ip.c
• Orig date: Tue Jul 25 18:21:24 1995

diff -u --recursive --new-file v1.3.13/linux/net/ipv4/ip.c linux/net/ipv4/ip.c
@@ -523,7 +523,7 @@
 	qp->dev = dev;
 
 	/* Start a timer for this entry. */
-	qp->timer.expires = IP_FRAG_TIME;		/* about 30 seconds	*/
+	qp->timer.expires = jiffies + IP_FRAG_TIME;	/* about 30 seconds	*/
 	qp->timer.data = (unsigned long) qp;		/* pointer to queue	*/
 	qp->timer.function = ip_expire;			/* expire function	*/
 	add_timer(&qp->timer);
@@ -682,7 +682,7 @@
 	if (qp != NULL)
 	{
 		del_timer(&qp->timer);
-		qp->timer.expires = IP_FRAG_TIME;	/* about 30 seconds */
+		qp->timer.expires = jiffies + IP_FRAG_TIME;	/* about 30 seconds */
 		qp->timer.data = (unsigned long) qp;	/* pointer to queue */
 		qp->timer.function = ip_expire;		/* expire function */
 		add_timer(&qp->timer);
@@ -1974,7 +1974,7 @@
                                 len+=sprintf(buffer+len,
 					"\t\t\t%08lX %5d %d:%08lX\n",
                                         im->multiaddr, im->users,
-					im->tm_running, im->timer.expires);
+					im->tm_running, im->timer.expires-jiffies);
                                 pos=begin+len;
                                 if(pos<offset)
                                 {