From owner-svn-src-stable-9@FreeBSD.ORG  Sun Jul  1 08:21:09 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2010C106566B;
	Sun,  1 Jul 2012 08:21:09 +0000 (UTC)
	(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A80B8FC18;
	Sun,  1 Jul 2012 08:21:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q618L8o8076907;
	Sun, 1 Jul 2012 08:21:08 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q618L8uP076905;
	Sun, 1 Jul 2012 08:21:08 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <201207010821.q618L8uP076905@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sun, 1 Jul 2012 08:21:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237906 - stable/9/sys/netinet
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jul 2012 08:21:09 -0000

Author: tuexen
Date: Sun Jul  1 08:21:08 2012
New Revision: 237906
URL: http://svn.freebsd.org/changeset/base/237906

Log:
  MFC r236522:
  Remove code which is not needed.

Modified:
  stable/9/sys/netinet/sctp_pcb.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/9/sys/netinet/sctp_pcb.c	Sun Jul  1 08:20:13 2012	(r237905)
+++ stable/9/sys/netinet/sctp_pcb.c	Sun Jul  1 08:21:08 2012	(r237906)
@@ -2187,8 +2187,6 @@ sctp_findassociation_addr(struct mbuf *m
 			from6->sin6_addr = ip6->ip6_src;
 			from6->sin6_port = sh->src_port;
 			/* Get the scopes in properly to the sin6 addr's */
-			/* we probably don't need these operations */
-			(void)sa6_recoverscope(from6);
 			sa6_embedscope(from6, MODULE_GLOBAL(ip6_use_defzone));
 			break;
 		}
@@ -2230,8 +2228,6 @@ sctp_findassociation_addr(struct mbuf *m
 			to6->sin6_addr = ip6->ip6_dst;
 			to6->sin6_port = sh->dest_port;
 			/* Get the scopes in properly to the sin6 addr's */
-			/* we probably don't need these operations */
-			(void)sa6_recoverscope(to6);
 			sa6_embedscope(to6, MODULE_GLOBAL(ip6_use_defzone));
 			break;
 		}