Permalink
Browse files

Merge r257841 from head:

  Catch up with sb_timeo type change in r255138. This fixes
  smbfs operation.

PR:		kern/182963
Approved by:	re (kib)
  • Loading branch information...
1 parent 2335913 commit 6e9011bd59a20b07230bd4fe50f79a2f20e23116 @glebius glebius committed Nov 14, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 sys/netsmb/smb_trantcp.c
View
@@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct sockaddr_in *to, struct thread *td)
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;

0 comments on commit 6e9011b

Please sign in to comment.