svn commit: r319272 - stable/10/sys/dev/cxgbe/iw_cxgbe

Navdeep Parhar np at FreeBSD.org
Wed May 31 00:43:54 UTC 2017


Author: np
Date: Wed May 31 00:43:52 2017
New Revision: 319272
URL: https://svnweb.freebsd.org/changeset/base/319272

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

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

Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c
==============================================================================
--- stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c	Wed May 31 00:43:34 2017	(r319271)
+++ stable/10/sys/dev/cxgbe/iw_cxgbe/cm.c	Wed May 31 00:43:52 2017	(r319272)
@@ -2390,6 +2390,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);
@@ -2397,13 +2399,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) {


More information about the svn-src-all mailing list