Re: MLDv1 /proc/net/igmp6 timer printing [PATCH]

[David Stevens <dlstevens@xxxxxxxxxx>]

Ok, here's the revised patch.

            +-DLS

--- linux-2.6.0-test9-bk23/net/ipv6/mcast.c     2003-11-18 23:20:56.000000000 
-0800
+++ linux-2.6.0-test9-bk23F1/net/ipv6/mcast.c   2003-11-18 23:30:18.573414608 
-0800
@@ -36,6 +36,7 @@
 #include <linux/socket.h>
 #include <linux/sockios.h>
 #include <linux/jiffies.h>
+#include <linux/times.h>
 #include <linux/net.h>
 #include <linux/in.h>
 #include <linux/in6.h>
@@ -978,6 +979,7 @@
      ma->mca_timer.expires = jiffies + delay;
      if (!mod_timer(&ma->mca_timer, jiffies + delay))
            atomic_inc(&ma->mca_refcnt);
+     ma->mca_flags |= MAF_TIMER_RUNNING;
 }

 static void mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,
@@ -2157,7 +2159,8 @@
               state->dev->ifindex, state->dev->name,
               NIP6(im->mca_addr),
               im->mca_users, im->mca_flags,
-              (im->mca_flags&MAF_TIMER_RUNNING) ? 
im->mca_timer.expires-jiffies : 0);
+              (im->mca_flags&MAF_TIMER_RUNNING) ?
+              jiffies_to_clock_t(im->mca_timer.expires-jiffies) : 0);
      return 0;
 }

(See attached file: mld2tr2.patch)

mld2tr2.patch
Description: Binary data