svn commit: r263070 - stable/9/sys/netinet6

Christian Brueffer brueffer at FreeBSD.org
Wed Mar 12 08:16:18 UTC 2014


Author: brueffer
Date: Wed Mar 12 08:16:17 2014
New Revision: 263070
URL: http://svnweb.freebsd.org/changeset/base/263070

Log:
  MFC: r261710
  
  Only count table lookups when we're actually processing packets.
  
  PR:             183462
  Submitted by:   Sven-Thorsten Dietrich <thebigcorporation at gmail.com>
  Reviewed by:    bms

Modified:
  stable/9/sys/netinet6/ip6_mroute.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/ip6_mroute.c
==============================================================================
--- stable/9/sys/netinet6/ip6_mroute.c	Wed Mar 12 08:15:15 2014	(r263069)
+++ stable/9/sys/netinet6/ip6_mroute.c	Wed Mar 12 08:16:17 2014	(r263070)
@@ -280,7 +280,6 @@ static VNET_DEFINE(int, pim6);
 #define MF6CFIND(o, g, rt) do { \
 	struct mf6c *_rt = mf6ctable[MF6CHASH(o,g)]; \
 	rt = NULL; \
-	MRT6STAT_INC(mrt6s_mfc_lookups); \
 	while (_rt) { \
 		if (IN6_ARE_ADDR_EQUAL(&_rt->mf6c_origin.sin6_addr, &(o)) && \
 		    IN6_ARE_ADDR_EQUAL(&_rt->mf6c_mcastgrp.sin6_addr, &(g)) && \
@@ -1096,6 +1095,7 @@ X_ip6_mforward(struct ip6_hdr *ip6, stru
 	 * Determine forwarding mifs from the forwarding cache table
 	 */
 	MF6CFIND(ip6->ip6_src, ip6->ip6_dst, rt);
+	MRT6STAT_INC(mrt6s_mfc_lookups);
 
 	/* Entry exists, so forward if necessary */
 	if (rt) {


More information about the svn-src-stable-9 mailing list