From owner-svn-src-all@FreeBSD.ORG  Sat Aug  9 14:33:44 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@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 EAC609C2
 for <svn-src-all@freebsd.org>; Sat,  9 Aug 2014 14:33:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C117A21A4
 for <svn-src-all@freebsd.org>; Sat,  9 Aug 2014 14:33:44 +0000 (UTC)
Received: from tuexen (uid 1198) (envelope-from tuexen@FreeBSD.org) id 291d
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Sat, 09 Aug 2014 14:33:44 +0000
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sat, 9 Aug 2014 14:33:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269753 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e63148.291d.71cb6cd3@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Aug 2014 14:33:45 -0000

Author: tuexen
Date: Sat Aug  9 14:33:44 2014
New Revision: 269753
URL: http://svnweb.freebsd.org/changeset/base/269753

Log:
  Small modification of the sctp_input() cleanup to avoid having
  code between declariations.

Modified:
  head/sys/netinet/sctp_input.c

Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c	Sat Aug  9 14:05:01 2014	(r269752)
+++ head/sys/netinet/sctp_input.c	Sat Aug  9 14:33:44 2014	(r269753)
@@ -6109,7 +6109,7 @@ extern int *sctp_cpuarry;
 #endif
 
 int
-sctp_input(struct mbuf **mp, int *offp, int proto)
+sctp_input(struct mbuf **mp, int *offp, int proto SCTP_UNUSED)
 {
 	struct mbuf *m;
 	int off;
@@ -6117,13 +6117,13 @@ sctp_input(struct mbuf **mp, int *offp, 
 	m = *mp;
 	off = *offp;
 #if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
-	struct ip *ip;
-	struct sctphdr *sh;
-	int offset;
-	int cpu_to_use;
-	uint32_t flowid, tag;
-
 	if (mp_ncpus > 1) {
+		struct ip *ip;
+		struct sctphdr *sh;
+		int offset;
+		int cpu_to_use;
+		uint32_t flowid, tag;
+
 		if (m->m_flags & M_FLOWID) {
 			flowid = m->m_pkthdr.flowid;
 		} else {