* [PATCH net] sctp: remove the useless check in sctp_renege_events
@ 2018-02-12 10:31 Xin Long
2018-02-12 12:35 ` Marcelo Ricardo Leitner
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Xin Long @ 2018-02-12 10:31 UTC (permalink / raw)
To: network dev, linux-sctp; +Cc: davem, Marcelo Ricardo Leitner, Neil Horman
Remove the 'if (chunk)' check in sctp_renege_events for idata process,
as all renege commands are generated in sctp_eat_data and it can't be
NULL.
The same thing we already did for common data in sctp_ulpq_renege.
Fixes: 94014e8d871a ("sctp: implement renege_events for sctp_stream_interleave")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
---
net/sctp/stream_interleave.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
index c19fd42..65ac03b 100644
--- a/net/sctp/stream_interleave.c
+++ b/net/sctp/stream_interleave.c
@@ -955,12 +955,8 @@ static void sctp_renege_events(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
__u32 freed = 0;
__u16 needed;
- if (chunk) {
- needed = ntohs(chunk->chunk_hdr->length);
- needed -= sizeof(struct sctp_idata_chunk);
- } else {
- needed = SCTP_DEFAULT_MAXWINDOW;
- }
+ needed = ntohs(chunk->chunk_hdr->length) -
+ sizeof(struct sctp_idata_chunk);
if (skb_queue_empty(&asoc->base.sk->sk_receive_queue)) {
freed = sctp_ulpq_renege_list(ulpq, &ulpq->lobby, needed);
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net] sctp: remove the useless check in sctp_renege_events
2018-02-12 10:31 [PATCH net] sctp: remove the useless check in sctp_renege_events Xin Long
@ 2018-02-12 12:35 ` Marcelo Ricardo Leitner
2018-02-12 14:16 ` Neil Horman
2018-02-12 16:47 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Marcelo Ricardo Leitner @ 2018-02-12 12:35 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Neil Horman
On Mon, Feb 12, 2018 at 06:31:24PM +0800, Xin Long wrote:
> Remove the 'if (chunk)' check in sctp_renege_events for idata process,
> as all renege commands are generated in sctp_eat_data and it can't be
> NULL.
>
> The same thing we already did for common data in sctp_ulpq_renege.
>
> Fixes: 94014e8d871a ("sctp: implement renege_events for sctp_stream_interleave")
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
For future reference, I don't think the Fixes tag is needed here, as
it was working and without performance impact.
> ---
> net/sctp/stream_interleave.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
> index c19fd42..65ac03b 100644
> --- a/net/sctp/stream_interleave.c
> +++ b/net/sctp/stream_interleave.c
> @@ -955,12 +955,8 @@ static void sctp_renege_events(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
> __u32 freed = 0;
> __u16 needed;
>
> - if (chunk) {
> - needed = ntohs(chunk->chunk_hdr->length);
> - needed -= sizeof(struct sctp_idata_chunk);
> - } else {
> - needed = SCTP_DEFAULT_MAXWINDOW;
> - }
> + needed = ntohs(chunk->chunk_hdr->length) -
> + sizeof(struct sctp_idata_chunk);
>
> if (skb_queue_empty(&asoc->base.sk->sk_receive_queue)) {
> freed = sctp_ulpq_renege_list(ulpq, &ulpq->lobby, needed);
> --
> 2.1.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] sctp: remove the useless check in sctp_renege_events
2018-02-12 10:31 [PATCH net] sctp: remove the useless check in sctp_renege_events Xin Long
2018-02-12 12:35 ` Marcelo Ricardo Leitner
@ 2018-02-12 14:16 ` Neil Horman
2018-02-12 16:47 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Neil Horman @ 2018-02-12 14:16 UTC (permalink / raw)
To: Xin Long; +Cc: network dev, linux-sctp, davem, Marcelo Ricardo Leitner
On Mon, Feb 12, 2018 at 06:31:24PM +0800, Xin Long wrote:
> Remove the 'if (chunk)' check in sctp_renege_events for idata process,
> as all renege commands are generated in sctp_eat_data and it can't be
> NULL.
>
> The same thing we already did for common data in sctp_ulpq_renege.
>
> Fixes: 94014e8d871a ("sctp: implement renege_events for sctp_stream_interleave")
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
> ---
> net/sctp/stream_interleave.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
> index c19fd42..65ac03b 100644
> --- a/net/sctp/stream_interleave.c
> +++ b/net/sctp/stream_interleave.c
> @@ -955,12 +955,8 @@ static void sctp_renege_events(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
> __u32 freed = 0;
> __u16 needed;
>
> - if (chunk) {
> - needed = ntohs(chunk->chunk_hdr->length);
> - needed -= sizeof(struct sctp_idata_chunk);
> - } else {
> - needed = SCTP_DEFAULT_MAXWINDOW;
> - }
> + needed = ntohs(chunk->chunk_hdr->length) -
> + sizeof(struct sctp_idata_chunk);
>
> if (skb_queue_empty(&asoc->base.sk->sk_receive_queue)) {
> freed = sctp_ulpq_renege_list(ulpq, &ulpq->lobby, needed);
> --
> 2.1.0
>
>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net] sctp: remove the useless check in sctp_renege_events
2018-02-12 10:31 [PATCH net] sctp: remove the useless check in sctp_renege_events Xin Long
2018-02-12 12:35 ` Marcelo Ricardo Leitner
2018-02-12 14:16 ` Neil Horman
@ 2018-02-12 16:47 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2018-02-12 16:47 UTC (permalink / raw)
To: lucien.xin; +Cc: netdev, linux-sctp, marcelo.leitner, nhorman
From: Xin Long <lucien.xin@gmail.com>
Date: Mon, 12 Feb 2018 18:31:24 +0800
> Remove the 'if (chunk)' check in sctp_renege_events for idata process,
> as all renege commands are generated in sctp_eat_data and it can't be
> NULL.
>
> The same thing we already did for common data in sctp_ulpq_renege.
>
> Fixes: 94014e8d871a ("sctp: implement renege_events for sctp_stream_interleave")
> Signed-off-by: Xin Long <lucien.xin@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-12 16:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-12 10:31 [PATCH net] sctp: remove the useless check in sctp_renege_events Xin Long
2018-02-12 12:35 ` Marcelo Ricardo Leitner
2018-02-12 14:16 ` Neil Horman
2018-02-12 16:47 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).