Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 May 2017 00:43:35 +0000 (UTC)
From:      Navdeep Parhar <np@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r319271 - stable/11/sys/dev/cxgbe/iw_cxgbe
Message-ID:  <201705310043.v4V0hZhI024925@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: np
Date: Wed May 31 00:43:34 2017
New Revision: 319271
URL: https://svnweb.freebsd.org/changeset/base/319271

Log:
  MFC r318774:
  
  cxgbe/iw_cxgbe: sodisconnect failures are harmless and should not be
  treated as fatal errors.
  
  Sponsored by:	Chelsio Communications

Modified:
  stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c
==============================================================================
--- stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c	Wed May 31 00:16:43 2017	(r319270)
+++ stable/11/sys/dev/cxgbe/iw_cxgbe/cm.c	Wed May 31 00:43:34 2017	(r319271)
@@ -2376,6 +2376,8 @@ int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt,
 			set_bit(EP_DISC_ABORT, &ep->com.history);
 			close_complete_upcall(ep, -ECONNRESET);
 			ret = send_abort(ep);
+			if (ret)
+				fatal = 1;
 		} else {
 
 			CTR2(KTR_IW_CXGBE, "%s:ced5 %p", __func__, ep);
@@ -2383,13 +2385,9 @@ int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt,
 
 			if (!ep->parent_ep)
 				__state_set(&ep->com, MORIBUND);
-			ret = sodisconnect(ep->com.so);
+			sodisconnect(ep->com.so);
 		}
 
-		if (ret) {
-
-			fatal = 1;
-		}
 	}
 
 	if (fatal) {



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