From owner-svn-src-user@FreeBSD.ORG  Wed Dec 18 16:14:36 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 76D2BFC9;
 Wed, 18 Dec 2013 16:14:36 +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 63DC61AED;
 Wed, 18 Dec 2013 16:14:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIGEa23067218;
 Wed, 18 Dec 2013 16:14:36 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIGEa9q067217;
 Wed, 18 Dec 2013 16:14:36 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201312181614.rBIGEa9q067217@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Wed, 18 Dec 2013 16:14:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r259560 - user/ae/inet6/sys/netinet6
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.17
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, 18 Dec 2013 16:14:36 -0000

Author: ae
Date: Wed Dec 18 16:14:35 2013
New Revision: 259560
URL: http://svnweb.freebsd.org/changeset/base/259560

Log:
  Try to use sticky output options when they aren't specified.

Modified:
  user/ae/inet6/sys/netinet6/in6_src.c

Modified: user/ae/inet6/sys/netinet6/in6_src.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_src.c	Wed Dec 18 16:12:51 2013	(r259559)
+++ user/ae/inet6/sys/netinet6/in6_src.c	Wed Dec 18 16:14:35 2013	(r259560)
@@ -587,6 +587,8 @@ in6_selectsrc(struct sockaddr_in6 *dst, 
 		INP_LOCK_ASSERT(inp);
 		mopts = inp->in6p_moptions;
 		fibnum = inp->inp_inc.inc_fibnum;
+		if (opts == NULL)
+			opts = inp->in6p_outputopts;
 	} else {
 		mopts = NULL;
 		fibnum = RT_DEFAULT_FIB;