diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-23 06:30:19 -0400 |
| commit | dda93b45389f025fd3422d22cc31cc1ea6040305 (patch) | |
| tree | 44a856744843e24ed1baf6ca4edb1be04809a606 /net/sctp/outqueue.c | |
| parent | 2e62024c265aa69315ed02835623740030435380 (diff) | |
| parent | b61b8bba18fe2b63d38fdaf9b83de25e2d787dfe (diff) | |
Merge branch 'x86/cache' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.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: |