Netdev List
 help / color / mirror / Atom feed
From: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, lucien.xin@gmail.com, nhorman@tuxdriver.com
Subject: Re: [PATCH v5 2/5] sctp: Always pass skbs on a list to sctp_ulpq_tail_event().
Date: Thu, 11 Apr 2019 19:18:01 -0300	[thread overview]
Message-ID: <20190411221801.GN10452@localhost.localdomain> (raw)
In-Reply-To: <20190411.150157.1608261572973187963.davem@davemloft.net>

On Thu, Apr 11, 2019 at 03:01:57PM -0700, David Miller wrote:
> 
> This way we can simplify the logic and remove assumptions
> about the implementation of skb lists.
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>

> ---
>  net/sctp/ulpqueue.c | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c
> index 0fecc1fb4ab7..b22f558adc49 100644
> --- a/net/sctp/ulpqueue.c
> +++ b/net/sctp/ulpqueue.c
> @@ -738,19 +738,19 @@ void sctp_ulpq_reasm_flushtsn(struct sctp_ulpq *ulpq, __u32 fwd_tsn)
>  static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq)
>  {
>  	struct sctp_ulpevent *event = NULL;
> -	struct sk_buff_head temp;
>  
>  	if (skb_queue_empty(&ulpq->reasm))
>  		return;
>  
>  	while ((event = sctp_ulpq_retrieve_reassembled(ulpq)) != NULL) {
> -		/* Do ordering if needed.  */
> -		if (event->msg_flags & MSG_EOR) {
> -			skb_queue_head_init(&temp);
> -			__skb_queue_tail(&temp, sctp_event2skb(event));
> +		struct sk_buff_head temp;
> +
> +		skb_queue_head_init(&temp);
> +		__skb_queue_tail(&temp, sctp_event2skb(event));
>  
> +		/* Do ordering if needed.  */
> +		if (event->msg_flags & MSG_EOR)
>  			event = sctp_ulpq_order(ulpq, event);
> -		}
>  
>  		/* Send event to the ULP.  'event' is the
>  		 * sctp_ulpevent for  very first SKB on the  temp' list.
> @@ -1082,6 +1082,10 @@ void sctp_ulpq_partial_delivery(struct sctp_ulpq *ulpq,
>  		event = sctp_ulpq_retrieve_first(ulpq);
>  		/* Send event to the ULP.   */
>  		if (event) {
> +			struct sk_buff_head temp;
> +
> +			skb_queue_head_init(&temp);
> +			__skb_queue_tail(&temp, sctp_event2skb(event));
>  			sctp_ulpq_tail_event(ulpq, event);
>  			sctp_ulpq_set_pd(ulpq);
>  			return;
> -- 
> 2.20.1
> 

  reply	other threads:[~2019-04-11 22:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-11 22:01 [PATCH v5 2/5] sctp: Always pass skbs on a list to sctp_ulpq_tail_event() David Miller
2019-04-11 22:18 ` Marcelo Ricardo Leitner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-04-10 21:20 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190411221801.GN10452@localhost.localdomain \
    --to=marcelo.leitner@gmail.com \
    --cc=davem@davemloft.net \
    --cc=lucien.xin@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox