svn commit: r320418 - head/sys/dev/cxgbe/iw_cxgbe

Navdeep Parhar np at FreeBSD.org
Tue Jun 27 17:45:49 UTC 2017


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;


More information about the svn-src-all mailing list