From owner-svn-src-stable@FreeBSD.ORG  Thu Mar  7 23:18:36 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 61E07690;
 Thu,  7 Mar 2013 23:18:36 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 48CF7A14;
 Thu,  7 Mar 2013 23:18:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27NIa6A049504;
 Thu, 7 Mar 2013 23:18:36 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27NIZLj049502;
 Thu, 7 Mar 2013 23:18:35 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201303072318.r27NIZLj049502@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Thu, 7 Mar 2013 23:18:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247964 - stable/8/sys/netinet6
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 23:18:36 -0000

Author: tuexen
Date: Thu Mar  7 23:18:35 2013
New Revision: 247964
URL: http://svnweb.freebsd.org/changeset/base/247964

Log:
  MFC r235916:
  
  Introduce in6_getscope() to allow more effective checksum
  computations without the need to copy the address to clear the
  scope.

Modified:
  stable/8/sys/netinet6/scope6.c
  stable/8/sys/netinet6/scope6_var.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/netinet6/   (props changed)

Modified: stable/8/sys/netinet6/scope6.c
==============================================================================
--- stable/8/sys/netinet6/scope6.c	Thu Mar  7 22:54:28 2013	(r247963)
+++ stable/8/sys/netinet6/scope6.c	Thu Mar  7 23:18:35 2013	(r247964)
@@ -486,3 +486,16 @@ in6_clearscope(struct in6_addr *in6)
 
 	return (modified);
 }
+
+/*
+ * Return the scope identifier or zero.
+ */
+uint16_t
+in6_getscope(struct in6_addr *in6)
+{
+
+	if (IN6_IS_SCOPE_LINKLOCAL(in6) || IN6_IS_ADDR_MC_INTFACELOCAL(in6))
+		return (in6->s6_addr16[1]);
+
+	return (0);
+}

Modified: stable/8/sys/netinet6/scope6_var.h
==============================================================================
--- stable/8/sys/netinet6/scope6_var.h	Thu Mar  7 22:54:28 2013	(r247963)
+++ stable/8/sys/netinet6/scope6_var.h	Thu Mar  7 23:18:35 2013	(r247964)
@@ -54,6 +54,7 @@ int	sa6_embedscope __P((struct sockaddr_
 int	sa6_recoverscope __P((struct sockaddr_in6 *));
 int	in6_setscope __P((struct in6_addr *, struct ifnet *, u_int32_t *));
 int	in6_clearscope __P((struct in6_addr *));
+uint16_t in6_getscope(struct in6_addr *);
 #endif /* _KERNEL */
 
 #endif /* _NETINET6_SCOPE6_VAR_H_ */