From owner-svn-src-user@freebsd.org Mon Aug 22 03:48:40 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 63372BC1C3E for ; Mon, 22 Aug 2016 03:48:40 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3488212A0; Mon, 22 Aug 2016 03:48:40 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7M3md9s025208; Mon, 22 Aug 2016 03:48:39 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7M3mdvB025206; Mon, 22 Aug 2016 03:48:39 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201608220348.u7M3mdvB025206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 22 Aug 2016 03:48:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r304585 - in user/alc/PQ_LAUNDRY/sys: dev/alc netinet X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Aug 2016 03:48:40 -0000 Author: markj Date: Mon Aug 22 03:48:39 2016 New Revision: 304585 URL: https://svnweb.freebsd.org/changeset/base/304585 Log: MFH r304584 Modified: user/alc/PQ_LAUNDRY/sys/dev/alc/if_alcvar.h user/alc/PQ_LAUNDRY/sys/netinet/sctp_output.c Directory Properties: user/alc/PQ_LAUNDRY/ (props changed) Modified: user/alc/PQ_LAUNDRY/sys/dev/alc/if_alcvar.h ============================================================================== --- user/alc/PQ_LAUNDRY/sys/dev/alc/if_alcvar.h Mon Aug 22 03:28:06 2016 (r304584) +++ user/alc/PQ_LAUNDRY/sys/dev/alc/if_alcvar.h Mon Aug 22 03:48:39 2016 (r304585) @@ -235,7 +235,8 @@ struct alc_softc { #define ALC_FLAG_APS 0x1000 #define ALC_FLAG_AR816X_FAMILY 0x2000 #define ALC_FLAG_LINK_WAR 0x4000 -#define ALC_FLAG_LINK 0x8000 +#define ALC_FLAG_E2X00 0x8000 +#define ALC_FLAG_LINK 0x10000 struct callout alc_tick_ch; struct alc_hw_stats alc_stats; Modified: user/alc/PQ_LAUNDRY/sys/netinet/sctp_output.c ============================================================================== --- user/alc/PQ_LAUNDRY/sys/netinet/sctp_output.c Mon Aug 22 03:28:06 2016 (r304584) +++ user/alc/PQ_LAUNDRY/sys/netinet/sctp_output.c Mon Aug 22 03:48:39 2016 (r304585) @@ -12639,7 +12639,10 @@ sctp_lower_sosend(struct socket *so, } SCTP_INP_RUNLOCK(inp); } else if (sinfo_assoc_id) { - stcb = sctp_findassociation_ep_asocid(inp, sinfo_assoc_id, 0); + stcb = sctp_findassociation_ep_asocid(inp, sinfo_assoc_id, 1); + if (stcb != NULL) { + hold_tcblock = 1; + } } else if (addr) { /*- * Since we did not use findep we must @@ -13404,6 +13407,10 @@ skip_preblock: } } SCTP_TCB_SEND_LOCK(stcb); + if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { + SCTP_TCB_SEND_UNLOCK(stcb); + goto out_unlocked; + } if (sp) { if (sp->msg_is_complete == 0) { strm->last_msg_incomplete = 1;