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

Next file: linux/net/ipv4/igmp.c
Previous file: linux/net/ethernet/pe2.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.13/linux/net/ipv4/arp.c linux/net/ipv4/arp.c
@@ -232,7 +232,7 @@
 	 */
 
 	del_timer(&arp_timer);
-	arp_timer.expires = ARP_CHECK_INTERVAL;
+	arp_timer.expires = jiffies + ARP_CHECK_INTERVAL;
 	add_timer(&arp_timer);
 }
 
@@ -411,7 +411,7 @@
 
 		/* Set new timer. */
 		del_timer(&entry->timer);
-		entry->timer.expires = ARP_RES_TIME;
+		entry->timer.expires = jiffies + ARP_RES_TIME;
 		add_timer(&entry->timer);
 		restore_flags(flags);
 		arp_send(ARPOP_REQUEST, ETH_P_ARP, ip, dev, dev->pa_addr, 
@@ -962,7 +962,7 @@
 		init_timer(&entry->timer);
 		entry->timer.function = arp_expire_request;
 		entry->timer.data = (unsigned long)entry;
-		entry->timer.expires = ARP_RES_TIME;
+		entry->timer.expires = jiffies + ARP_RES_TIME;
 		arp_tables[hash] = entry;
 		add_timer(&entry->timer);
 		entry->retries = ARP_MAX_TRIES;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this