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

2 messages, 2 authors, 2003-11-19 · open the first message on its own page

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

From: David Stevens <hidden>
Date: 2003-11-19 07:59:20




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)

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

From: YOSHIFUJI Hideaki / 吉藤英明 <hidden>
Date: 2003-11-19 08:05:00

In article [off-list ref] (at Wed, 19 Nov 2003 00:59:20 -0700), David Stevens [off-list ref] says:
Ok, here's the revised patch.
please fix ipv4 as well.

Index: net/ipv4/igmp.c
===================================================================
RCS file: /cvsroot/usagi/usagi/kernel/linux26/net/ipv4/igmp.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- net/ipv4/igmp.c	9 Oct 2003 02:49:24 -0000	1.20
+++ net/ipv4/igmp.c	19 Nov 2003 07:11:46 -0000	1.21
@@ -2215,7 +2215,7 @@
 		seq_printf(seq,
 			   "\t\t\t\t%08lX %5d %d:%08lX\t\t%d\n",
 			   im->multiaddr, im->users,
-			   im->tm_running, im->timer.expires-jiffies, im->reporter);
+			   im->tm_running, jiffies_to_clock_t(im->timer.expires-jiffies), im->reporter);
 	}
 	return 0;
 }
-- 
Hideaki YOSHIFUJI @ USAGI Project <yoshfuji@linux-ipv6.org>
GPG FP: 9022 65EB 1ECF 3AD1 0BDF  80D8 4807 F894 E062 0EEA
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help