summaryrefslogtreecommitdiffstats
path: root/net/sctp/sm_sideeffect.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-20 10:26:10 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-20 10:26:10 -0500
commitd4105267a1409b739907c09b895ac0e39980b367 (patch)
treeef5b3d50db0a6e1839f48be2b8484d11ab2ba9a2 /net/sctp/sm_sideeffect.c
parent93a66e93c7d8775f33c0d65e3fdeb209c1d4a8c9 (diff)
parent4ea0c32f5f42f7ef33a7ecfb9b61ff0cad9b3c08 (diff)
downloadblackbird-op-linux-d4105267a1409b739907c09b895ac0e39980b367.tar.gz
blackbird-op-linux-d4105267a1409b739907c09b895ac0e39980b367.zip
Merge branch 'sctp-MSG_MORE'
Xin Long says: ==================== sctp: support MSG_MORE flag when sending msg This patch is to add support for MSG_MORE on sctp. Patch 1/2 is an improvement ahead of patch 2/2 to solve the close block problem mentioned in https://patchwork.ozlabs.org/patch/372404/. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_sideeffect.c')
-rw-r--r--net/sctp/sm_sideeffect.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index 51abcc90fe75..25384fa82ba9 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -872,6 +872,10 @@ static void sctp_cmd_new_state(sctp_cmd_seq_t *cmds,
if (!sctp_style(sk, UDP))
sk->sk_state_change(sk);
}
+
+ if (sctp_state(asoc, SHUTDOWN_PENDING) &&
+ !sctp_outq_is_empty(&asoc->outqueue))
+ sctp_outq_uncork(&asoc->outqueue, GFP_ATOMIC);
}
/* Helper function to delete an association. */
OpenPOWER on IntegriCloud