From owner-svn-src-user@FreeBSD.ORG  Fri Nov 22 04:05:24 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E7E6BD96;
 Fri, 22 Nov 2013 04:05:24 +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 D8B9F2544;
 Fri, 22 Nov 2013 04:05:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAM45Oj5002748;
 Fri, 22 Nov 2013 04:05:24 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAM45OCJ002747;
 Fri, 22 Nov 2013 04:05:24 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201311220405.rAM45OCJ002747@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 22 Nov 2013 04:05:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258462 - 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:05:25 -0000

Author: ae
Date: Fri Nov 22 04:05:24 2013
New Revision: 258462
URL: http://svnweb.freebsd.org/changeset/base/258462

Log:
  Remove in6_clearscope call and unused variable.

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

Modified: user/ae/inet6/sys/dev/cxgbe/tom/t4_tom.c
==============================================================================
--- user/ae/inet6/sys/dev/cxgbe/tom/t4_tom.c	Fri Nov 22 04:02:40 2013	(r258461)
+++ user/ae/inet6/sys/dev/cxgbe/tom/t4_tom.c	Fri Nov 22 04:05:24 2013	(r258462)
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp_var.h>
-#include <netinet6/scope6_var.h>
 #define TCPSTATES
 #include <netinet/tcp_fsm.h>
 #include <netinet/toecore.h>
@@ -762,7 +761,7 @@ static void
 update_clip_table(struct adapter *sc, struct tom_data *td)
 {
 	struct in6_ifaddr *ia;
-	struct in6_addr *lip, tlip;
+	struct in6_addr *lip;
 	struct clip_head stale;
 	struct clip_entry *ce, *ce_temp;
 	int rc, gen = atomic_load_acq_int(&in6_ifaddr_gen);
@@ -786,12 +785,6 @@ update_clip_table(struct adapter *sc, st
 
 		if (IN6_IS_ADDR_LOOPBACK(lip))
 			continue;
-		if (IN6_IS_SCOPE_EMBED(lip)) {
-			/* Remove the embedded scope */
-			tlip = *lip;
-			lip = &tlip;
-			in6_clearscope(lip);
-		}
 		/*
 		 * XXX: how to weed out the link local address for the loopback
 		 * interface?  It's fe80::1 usually (always?).