Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Nov 2015 15:09:57 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r291075 - projects/cxl_iscsi/sys/dev/cxgbe/tom
Message-ID:  <201511191509.tAJF9vpF082486@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: np
Date: Thu Nov 19 15:09:57 2015
New Revision: 291075
URL: https://svnweb.freebsd.org/changeset/base/291075

Log:
  Deal with tx credits within t4_tom.  This should have gone in with r290376.

Modified:
  projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c

Modified: projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c	Thu Nov 19 14:04:53 2015	(r291074)
+++ projects/cxl_iscsi/sys/dev/cxgbe/tom/t4_cpl_io.c	Thu Nov 19 15:09:57 2015	(r291075)
@@ -1656,11 +1656,8 @@ do_fw4_ack(struct sge_iq *iq, const stru
 				sbdrop_locked(sb, min(sbu, plen));
 				plen -= min(sbu, plen);
 			}
-			/* XXXNP: sowwakeup_locked causes a LOR. */
-			SOCKBUF_UNLOCK(sb);
-
-			if (__predict_true(plen > 0))
-				cxgbei_fw4_ack(toep, plen);
+			sowwakeup_locked(so);	/* unlocks so_snd */
+			rqdrop_locked(&toep->ulp_pdu_reclaimq, plen);
 		} else {
 			sbdrop_locked(sb, plen);
 			sowwakeup_locked(so);	/* unlocks so_snd */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511191509.tAJF9vpF082486>