diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 09:33:21 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 09:33:21 -0400 |
| commit | ba1cb318dcbfc9754acda9656262aea97ebe77e6 (patch) | |
| tree | 770fadb8b2c77da5d4dd9d33535b2d7adcdb02fd /net/sctp/outqueue.c | |
| parent | 8f523d6db7ed69f69720267af170c0719023f373 (diff) | |
| parent | 0238df646e6224016a45505d2c111a24669ebe21 (diff) | |
Merge 4.19-rc7 into char-misc-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp/outqueue.c')
| -rw-r--r-- | net/sctp/outqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c index d74d00b29942..42191ed9902b 100644 --- a/net/sctp/outqueue.c +++ b/net/sctp/outqueue.c | |||
| @@ -1048,7 +1048,7 @@ static void sctp_outq_flush_data(struct sctp_flush_ctx *ctx, | |||
| 1048 | if (!ctx->packet || !ctx->packet->has_cookie_echo) | 1048 | if (!ctx->packet || !ctx->packet->has_cookie_echo) |
| 1049 | return; | 1049 | return; |
| 1050 | 1050 | ||
| 1051 | /* fallthru */ | 1051 | /* fall through */ |
| 1052 | case SCTP_STATE_ESTABLISHED: | 1052 | case SCTP_STATE_ESTABLISHED: |
| 1053 | case SCTP_STATE_SHUTDOWN_PENDING: | 1053 | case SCTP_STATE_SHUTDOWN_PENDING: |
| 1054 | case SCTP_STATE_SHUTDOWN_RECEIVED: | 1054 | case SCTP_STATE_SHUTDOWN_RECEIVED: |