diff options
| author |   Xin Long <lucien.xin@gmail.com> | 2018-02-16 17:18:33 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-02-16 16:32:37 -0500 |
| commit | 9ab2323ca184168c288f7355fc19ec0838efc20c (patch) | |
| tree | 5cb8afff946a6598d5cd937543315cfc4d4eb517 /net/sctp/stream_interleave.c | |
| parent | rxrpc: Work around usercopy check (diff) | |
| download | linux-dev-9ab2323ca184168c288f7355fc19ec0838efc20c.tar.xz linux-dev-9ab2323ca184168c288f7355fc19ec0838efc20c.zip | |
sctp: remove the left unnecessary check for chunk in sctp_renege_events
Commit fb23403536ea ("sctp: remove the useless check in
sctp_renege_events") forgot to remove another check for
chunk in sctp_renege_events.
Dan found this when doing a static check.
This patch is to remove that check, and also to merge
two checks into one 'if statement'.
Fixes: fb23403536ea ("sctp: remove the useless check in sctp_renege_events")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sctp/stream_interleave.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c index 65ac03b44df8..d3764c181299 100644 --- a/net/sctp/stream_interleave.c +++ b/net/sctp/stream_interleave.c @@ -968,9 +968,8 @@ static void sctp_renege_events(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, needed); } - if (chunk && freed >= needed) - if (sctp_ulpevent_idata(ulpq, chunk, gfp) <= 0) - sctp_intl_start_pd(ulpq, gfp); + if (freed >= needed && sctp_ulpevent_idata(ulpq, chunk, gfp) <= 0) + sctp_intl_start_pd(ulpq, gfp); sk_mem_reclaim(asoc->base.sk); } |