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

Next file: linux/net/ipv4/route.c
Previous file: linux/net/ipv4/af_inet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.67/linux/net/ipv4/igmp.c linux/net/ipv4/igmp.c
@@ -53,6 +53,9 @@
  *					message (960131).
  *		Christian Daudt :	removed del_timer from 
  *					igmp_timer_expire function (960205).
+ *             Christian Daudt :       igmp_heard_report now only calls
+ *                                     igmp_timer_expire if tm->running is
+ *                                     true (960216).
  */
 
 
@@ -288,7 +291,7 @@
 	if ((address & IGMP_LOCAL_GROUP_MASK) != IGMP_LOCAL_GROUP) {
 	  /* Timers are only set for non-local groups */
 	  for(im=dev->ip_mc_list;im!=NULL;im=im->next) {
-	    if(im->multiaddr==address) {
+	    if(im->multiaddr==address && im->tm_running) {
 	      igmp_stop_timer(im);
 	    }
 	  }

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