From owner-svn-src-head@FreeBSD.ORG  Sun Apr 27 02:20:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ECA2274F;
 Sun, 27 Apr 2014 02:20:09 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9B6A1CED;
 Sun, 27 Apr 2014 02:20:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3R2K9Vo077078;
 Sun, 27 Apr 2014 02:20:09 GMT
 (envelope-from melifaro@svn.freebsd.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3R2K9xP077077;
 Sun, 27 Apr 2014 02:20:09 GMT
 (envelope-from melifaro@svn.freebsd.org)
Message-Id: <201404270220.s3R2K9xP077077@svn.freebsd.org>
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 27 Apr 2014 02:20:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264998 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Apr 2014 02:20:10 -0000

Author: melifaro
Date: Sun Apr 27 02:20:09 2014
New Revision: 264998
URL: http://svnweb.freebsd.org/changeset/base/264998

Log:
  Move up fibnum to ensure it is always defined.
  
  Found by:	ian
  MFC with:	r264987

Modified:
  head/sys/net/rtsock.c

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Sun Apr 27 02:19:53 2014	(r264997)
+++ head/sys/net/rtsock.c	Sun Apr 27 02:20:09 2014	(r264998)
@@ -531,6 +531,8 @@ route_output(struct mbuf *m, struct sock
 	union sockaddr_union saun;
 	sa_family_t saf = AF_UNSPEC;
 
+	fibnum = so->so_fibnum;
+
 #define senderr(e) { error = e; goto flush;}
 	if (m == NULL || ((m->m_len < sizeof(long)) &&
 		       (m = m_pullup(m, sizeof(long))) == NULL))
@@ -582,8 +584,6 @@ route_output(struct mbuf *m, struct sock
 			senderr(error);
 	}
 
-	fibnum = so->so_fibnum;
-
 	/*
 	 * The given gateway address may be an interface address.
 	 * For example, issuing a "route change" command on a route