Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Mar 2014 08:15:16 +0000 (UTC)
From:      Christian Brueffer <brueffer@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r263069 - stable/10/sys/netinet6
Message-ID:  <201403120815.s2C8FGU5063403@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brueffer
Date: Wed Mar 12 08:15:15 2014
New Revision: 263069
URL: http://svnweb.freebsd.org/changeset/base/263069

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/10/sys/netinet6/ip6_mroute.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet6/ip6_mroute.c
==============================================================================
--- stable/10/sys/netinet6/ip6_mroute.c	Wed Mar 12 08:08:41 2014	(r263068)
+++ stable/10/sys/netinet6/ip6_mroute.c	Wed Mar 12 08:15:15 2014	(r263069)
@@ -283,7 +283,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)) && \
@@ -1099,6 +1098,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) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403120815.s2C8FGU5063403>