From owner-svn-src-user@FreeBSD.ORG  Wed Nov 27 04:34:44 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 D70F9573;
 Wed, 27 Nov 2013 04:34:44 +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 C6F1325EA;
 Wed, 27 Nov 2013 04:34:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAR4YiWn097480;
 Wed, 27 Nov 2013 04:34:44 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAR4YiJs097479;
 Wed, 27 Nov 2013 04:34:44 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201311270434.rAR4YiJs097479@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 27 Nov 2013 04:34:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258671 - user/ae/inet6/sys/netipsec
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: Wed, 27 Nov 2013 04:34:44 -0000

Author: ae
Date: Wed Nov 27 04:34:44 2013
New Revision: 258671
URL: http://svnweb.freebsd.org/changeset/base/258671

Log:
  Remove now unused variable.

Modified:
  user/ae/inet6/sys/netipsec/xform_ipip.c

Modified: user/ae/inet6/sys/netipsec/xform_ipip.c
==============================================================================
--- user/ae/inet6/sys/netipsec/xform_ipip.c	Wed Nov 27 04:31:01 2013	(r258670)
+++ user/ae/inet6/sys/netipsec/xform_ipip.c	Wed Nov 27 04:34:44 2013	(r258671)
@@ -426,7 +426,7 @@ ipip_output(
 	struct ip *ipo;
 #endif /* INET */
 #ifdef INET6
-	struct ip6_hdr *ip6, *ip6o;
+	struct ip6_hdr *ip6o;
 #endif /* INET6 */
 
 	sav = isr->sav;
@@ -534,8 +534,6 @@ ipip_output(
 			goto bad;
 		}
 
-		/* scoped address handling */
-		ip6 = mtod(m, struct ip6_hdr *);
 		M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT);
 		if (m == 0) {
 			DPRINTF(("%s: M_PREPEND failed\n", __func__));