svn commit: r201515 - stable/8/sys/netinet

[Shteryana Shopova]

Author: syrinx
Date: Mon Jan  4 15:58:36 2010
New Revision: 201515
URL: http://svn.freebsd.org/changeset/base/201515

Log:
  MFC r201254:
  Make sure the multicast forwarding cache entry's stall queue is properly
  initialized before trying to insert an entry into it.
  
  PR:		kern/142052
  Reviewed by:	bms

Modified:
  stable/8/sys/netinet/ip_mroute.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet/ip_mroute.c
==============================================================================
--- stable/8/sys/netinet/ip_mroute.c	Mon Jan  4 15:50:41 2010	(r201514)
+++ stable/8/sys/netinet/ip_mroute.c	Mon Jan  4 15:58:36 2010	(r201515)
@@ -1384,6 +1384,15 @@ fail:
 	    rt->mfc_rp.s_addr = INADDR_ANY;
 	    rt->mfc_bw_meter = NULL;
 
+	    /* initialize pkt counters per src-grp */
+	    rt->mfc_pkt_cnt = 0;
+	    rt->mfc_byte_cnt = 0;
+	    rt->mfc_wrong_if = 0;
+	    timevalclear(&rt->mfc_last_assert);
+
+	    TAILQ_INIT(&rt->mfc_stall);
+	    rt->mfc_nstall = 0;
+
 	    /* link into table */
 	    LIST_INSERT_HEAD(&mfchashtbl[hash], rt, mfc_hash);
 	    TAILQ_INSERT_HEAD(&rt->mfc_stall, rte, rte_link);