From owner-svn-src-user@FreeBSD.ORG  Thu Jun 14 12:31:51 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75ED8106564A;
	Thu, 14 Jun 2012 12:31:51 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 61B228FC15;
	Thu, 14 Jun 2012 12:31:51 +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 q5ECVpUv094236;
	Thu, 14 Jun 2012 12:31:51 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5ECVpov094234;
	Thu, 14 Jun 2012 12:31:51 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201206141231.q5ECVpov094234@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Thu, 14 Jun 2012 12:31:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237062 - user/andre/tcp_workqueue/sys/netinet
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 14 Jun 2012 12:31:51 -0000

Author: andre
Date: Thu Jun 14 12:31:50 2012
New Revision: 237062
URL: http://svn.freebsd.org/changeset/base/237062

Log:
  Fix mismerge from last integrate.

Modified:
  user/andre/tcp_workqueue/sys/netinet/tcp_subr.c

Modified: user/andre/tcp_workqueue/sys/netinet/tcp_subr.c
==============================================================================
--- user/andre/tcp_workqueue/sys/netinet/tcp_subr.c	Thu Jun 14 12:28:43 2012	(r237061)
+++ user/andre/tcp_workqueue/sys/netinet/tcp_subr.c	Thu Jun 14 12:31:50 2012	(r237062)
@@ -1672,7 +1672,6 @@ tcp_mtudisc(struct inpcb *inp, int mtuof
 {
 	struct tcpcb *tp;
 	struct socket *so;
-	int mtu;
 
 	INP_WLOCK_ASSERT(inp);
 	if ((inp->inp_flags & INP_TIMEWAIT) ||