[PATCH] (4/7) ipmr.c - convert to alloc_netdev
DORMANTno replies
From: Stephen Hemminger <hidden>
Date: 2003-06-25 18:41:21
Use time_after to avoid potential for jiffies wrap in timer code. diff -Nru a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
--- a/net/ipv4/ipmr.c Wed Jun 25 11:30:03 2003
+++ b/net/ipv4/ipmr.c Wed Jun 25 11:30:03 2003@@ -342,9 +342,8 @@ cp = &mfc_unres_queue; while ((c=*cp) != NULL) { - long interval = c->mfc_un.unres.expires - now; - - if (interval > 0) { + if (time_after(c->mfc_un.unres.expires, now)) { + unsigned long interval = c->mfc_un.unres.expires - now; if (interval < expires) expires = interval; cp = &c->next;
@@ -1291,7 +1290,8 @@ large chunk of pimd to kernel. Ough... --ANK */ (mroute_do_pim || cache->mfc_un.res.ttls[true_vifi] < 255) && - jiffies - cache->mfc_un.res.last_assert > MFC_ASSERT_THRESH) { + time_after(jiffies, + cache->mfc_un.res.last_assert + MFC_ASSERT_THRESH)) { cache->mfc_un.res.last_assert = jiffies; ipmr_cache_report(skb, true_vifi, IGMPMSG_WRONGVIF); }