patch-2.4.27 linux-2.4.27/net/ipv4/igmp.c

• Lines: 21
• Date: 2004-08-07 16:26:06.829436149 -0700
• Orig file: linux-2.4.26/net/ipv4/igmp.c
• Orig date: 2004-04-14 06:05:41.000000000 -0700

diff -urN linux-2.4.26/net/ipv4/igmp.c linux-2.4.27/net/ipv4/igmp.c
@@ -2126,7 +2126,8 @@
 			continue;
 
 #ifdef CONFIG_IP_MULTICAST
-		querier = IGMP_V1_SEEN(in_dev) ? "V1" : "V2";
+		querier = IGMP_V1_SEEN(in_dev) ? "V1" : IGMP_V2_SEEN(in_dev) ?
+			"V2" : "V3";
 #endif
 
 		len+=sprintf(buffer+len,"%d\t%-10s: %5d %7s\n",
@@ -2137,7 +2138,9 @@
 			len+=sprintf(buffer+len,
 				     "\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, im->tm_running ?
+				     im->timer.expires-jiffies : 0,
+				     im->reporter);
 
 			pos=begin+len;
 			if(pos<offset)