From owner-svn-src-head@freebsd.org Tue Jun 27 17:45:48 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA1B6D8C42B; Tue, 27 Jun 2017 17:45:48 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A86537681D; Tue, 27 Jun 2017 17:45:48 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5RHjldS033872; Tue, 27 Jun 2017 17:45:47 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5RHjls0033871; Tue, 27 Jun 2017 17:45:47 GMT (envelope-from np@FreeBSD.org) Message-Id: <201706271745.v5RHjls0033871@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 27 Jun 2017 17:45:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320418 - head/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: head X-SVN-Commit-Author: np X-SVN-Commit-Paths: head/sys/dev/cxgbe/iw_cxgbe X-SVN-Commit-Revision: 320418 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jun 2017 17:45:49 -0000 Author: np Date: Tue Jun 27 17:45:47 2017 New Revision: 320418 URL: https://svnweb.freebsd.org/changeset/base/320418 Log: cxgbe/iw_cxgbe: Catch up with r319722. The socket lock is not the same as the lock for the receive buffer any more. Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c Modified: head/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Jun 27 17:45:26 2017 (r320417) +++ head/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Jun 27 17:45:47 2017 (r320418) @@ -622,11 +622,10 @@ init_iwarp_socket(struct socket *so, void *arg) struct sockopt sopt; int on = 1; - /* Note that SOCK_LOCK(so) is same as SOCKBUF_LOCK(&so->so_rcv) */ - SOCK_LOCK(so); + SOCKBUF_LOCK(&so->so_rcv); soupcall_set(so, SO_RCV, c4iw_so_upcall, arg); so->so_state |= SS_NBIO; - SOCK_UNLOCK(so); + SOCKBUF_UNLOCK(&so->so_rcv); sopt.sopt_dir = SOPT_SET; sopt.sopt_level = IPPROTO_TCP; sopt.sopt_name = TCP_NODELAY;