From owner-svn-src-all@FreeBSD.ORG  Thu Nov 14 09:19:50 2013
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 D669CC23;
 Thu, 14 Nov 2013 09:19:50 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C60C3299D;
 Thu, 14 Nov 2013 09:19:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAE9Jopo040989;
 Thu, 14 Nov 2013 09:19:50 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAE9Jok2040988;
 Thu, 14 Nov 2013 09:19:50 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201311140919.rAE9Jok2040988@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 14 Nov 2013 09:19:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r258123 - stable/10/sys/netsmb
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.16
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: Thu, 14 Nov 2013 09:19:50 -0000

Author: glebius
Date: Thu Nov 14 09:19:50 2013
New Revision: 258123
URL: http://svnweb.freebsd.org/changeset/base/258123

Log:
  Merge r257841 from head:
  
    Catch up with sb_timeo type change in r255138. This fixes
    smbfs operation.
  
  PR:		kern/182963
  Approved by:	re (kib)

Modified:
  stable/10/sys/netsmb/smb_trantcp.c
Directory Properties:
  stable/10/sys/   (props changed)

Modified: stable/10/sys/netsmb/smb_trantcp.c
==============================================================================
--- stable/10/sys/netsmb/smb_trantcp.c	Thu Nov 14 09:17:27 2013	(r258122)
+++ stable/10/sys/netsmb/smb_trantcp.c	Thu Nov 14 09:19:50 2013	(r258123)
@@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct 
 	SOCKBUF_LOCK(&so->so_rcv);
 	soupcall_set(so, SO_RCV, nb_upcall, nbp);
 	SOCKBUF_UNLOCK(&so->so_rcv);
-	so->so_rcv.sb_timeo = (5 * hz);
-	so->so_snd.sb_timeo = (5 * hz);
+	so->so_rcv.sb_timeo = (5 * SBT_1S);
+	so->so_snd.sb_timeo = (5 * SBT_1S);
 	error = soreserve(so, nbp->nbp_sndbuf, nbp->nbp_rcvbuf);
 	if (error)
 		goto bad;