From owner-svn-src-user@FreeBSD.ORG  Fri Nov 22 04:02:41 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4508DC18;
 Fri, 22 Nov 2013 04:02:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35794252B;
 Fri, 22 Nov 2013 04:02:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAM42f0T002276;
 Fri, 22 Nov 2013 04:02:41 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAM42fGw002275;
 Fri, 22 Nov 2013 04:02:41 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201311220402.rAM42fGw002275@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 22 Nov 2013 04:02:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258461 - user/ae/inet6/sys/dev/cxgbe/tom
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Nov 2013 04:02:41 -0000

Author: ae
Date: Fri Nov 22 04:02:40 2013
New Revision: 258461
URL: http://svnweb.freebsd.org/changeset/base/258461

Log:
  Remove in6_clearscope and in6_setscope calls.
  Simplify ifnet_has_ip6 function.

Modified:
  user/ae/inet6/sys/dev/cxgbe/tom/t4_listen.c

Modified: user/ae/inet6/sys/dev/cxgbe/tom/t4_listen.c
==============================================================================
--- user/ae/inet6/sys/dev/cxgbe/tom/t4_listen.c	Fri Nov 22 02:03:50 2013	(r258460)
+++ user/ae/inet6/sys/dev/cxgbe/tom/t4_listen.c	Fri Nov 22 04:02:40 2013	(r258461)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
 #include <net/route.h>
@@ -52,7 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in_pcb.h>
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
-#include <netinet6/scope6_var.h>
+#include <netinet6/in6_var.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
 #define TCPSTATES
@@ -1085,22 +1086,14 @@ static int
 ifnet_has_ip6(struct ifnet *ifp, struct in6_addr *ip6)
 {
 	struct ifaddr *ifa;
-	struct sockaddr_in6 *sin6;
 	int found = 0;
-	struct in6_addr in6 = *ip6;
-
-	/* Just as in ip6_input */
-	if (in6_clearscope(&in6) || in6_clearscope(&in6))
-		return (0);
-	in6_setscope(&in6, ifp, NULL);
 
 	if_addr_rlock(ifp);
 	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
-		sin6 = (void *)ifa->ifa_addr;
-		if (sin6->sin6_family != AF_INET6)
+		if (ifa->ifa_addr->sa_family != AF_INET6)
 			continue;
 
-		if (IN6_ARE_ADDR_EQUAL(&sin6->sin6_addr, &in6)) {
+		if (IN6_ARE_ADDR_EQUAL(ip6, IFA_IN6(ifa))) {
 			found = 1;
 			break;
 		}