svn commit: r235032 - projects/iscsi_opt/sys/dev/iscsi/initiator

[Kip Macy]

Author: kmacy
Date: Fri May  4 19:44:58 2012
New Revision: 235032
URL: http://svn.freebsd.org/changeset/base/235032

Log:
  don't use upcall

Modified:
  projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c
  projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h

Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c
==============================================================================
--- projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c	Fri May  4 19:26:03 2012	(r235031)
+++ projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c	Fri May  4 19:44:58 2012	(r235032)
@@ -468,9 +468,6 @@ scsi_encap(struct cam_sim *sim, union cc
      sp = ccb_h->spriv_ptr0;
 
      if (isc_sowouldblock(sp, ccb)) {
-	     SOCKBUF_LOCK(&so->so_snd);
-	     soupcall_set(so, SO_SND, isc_so_snd_upcall, sp);
-	     SOCKBUF_UNLOCK(&so->so_snd);
 	     return (EWOULDBLOCK);
      }
 

Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h
==============================================================================
--- projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h	Fri May  4 19:26:03 2012	(r235031)
+++ projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h	Fri May  4 19:44:58 2012	(r235032)
@@ -337,11 +337,9 @@ XPT_DONE(isc_session_t *sp, union ccb *c
 	}
 	CAM_LOCK(sp);
 	if (sp->cam_flags & ISC_QFROZEN) {
-		if (sbspace(&sp->soc->so_snd) >= sp->space_needed) {
-			sp->space_needed = 0;
-			ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
-			sp->cam_flags &= ~ISC_QFROZEN;
-		}
+	  sp->space_needed = 0;
+	  ccb->ccb_h.status |= CAM_RELEASE_SIMQ;
+	  sp->cam_flags &= ~ISC_QFROZEN;
 	}
 	xpt_done(ccb);
 	CAM_UNLOCK(sp);