svn commit: r223193 - user/brooks/openssh-hpn

[Brooks Davis]

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;