From owner-svn-src-user@FreeBSD.ORG  Fri Jun 17 17:55:37 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3A21106566C;
	Fri, 17 Jun 2011 17:55:37 +0000 (UTC)
	(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C464F8FC0C;
	Fri, 17 Jun 2011 17:55:37 +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 p5HHtbCf000965;
	Fri, 17 Jun 2011 17:55:37 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5HHtbjj000963;
	Fri, 17 Jun 2011 17:55:37 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201106171755.p5HHtbjj000963@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 17 Jun 2011 17:55:37 +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: r223193 - user/brooks/openssh-hpn
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: Fri, 17 Jun 2011 17:55:37 -0000

Author: brooks
Date: Fri Jun 17 17:55:37 2011
New Revision: 223193
URL: http://svn.freebsd.org/changeset/base/223193

Log:
  Fix a couple mismerges

Modified:
  user/brooks/openssh-hpn/channels.c

Modified: user/brooks/openssh-hpn/channels.c
==============================================================================
--- user/brooks/openssh-hpn/channels.c	Fri Jun 17 17:43:35 2011	(r223192)
+++ user/brooks/openssh-hpn/channels.c	Fri Jun 17 17:55:37 2011	(r223193)
@@ -2856,7 +2856,7 @@ channel_setup_fwd_listener(int type, con
 			    0, "port listener", 1);
  		else
  			c = channel_new("port listener", type, sock, sock, -1,
- 		    	    hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT,
+ 		    	    buffer_size, CHAN_TCP_PACKET_DEFAULT,
  		    	    0, "port listener", 1); 
 		c->path = xstrdup(host);
 		c->host_port = port_to_connect;
@@ -3410,7 +3410,7 @@ x11_create_display_inet(int x11_display_
 		else
 			nc = channel_new("x11 listener",
 			    SSH_CHANNEL_X11_LISTENER, sock, sock, -1,
-			    hpn_buffer_size, CHAN_X11_PACKET_DEFAULT,
+			    buffer_size, CHAN_X11_PACKET_DEFAULT,
 			    0, "X11 inet listener", 1);
 		nc->single_connection = single_connection;
 		(*chanids)[n] = nc->self;