diff options
| author |   David Miller <davem@davemloft.net> | 2019-04-11 15:02:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-04-11 21:33:31 -0700 |
| commit | 178ca044aa60cb05102148b635cb82f6986451a3 (patch) | |
| tree | a8df6a4501ec1665a79bf59a15d54154285b385f /net/sctp/ulpqueue.c | |
| parent | sctp: Use helper for sctp_ulpq_tail_event() when hooked up to ->enqueue_event (diff) | |
| download | linux-dev-178ca044aa60cb05102148b635cb82f6986451a3.tar.xz linux-dev-178ca044aa60cb05102148b635cb82f6986451a3.zip | |
sctp: Make sctp_enqueue_event tak an skb list.
Pass this, instead of an event. Then everything trickles down and we
always have events a non-empty list.
Then we needs a list creating stub to place into .enqueue_event for sctp_stream_interleave_1.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/ulpqueue.c')
| -rw-r--r-- | net/sctp/ulpqueue.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index b22f558adc49..a698f1a509bf 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c @@ -116,12 +116,13 @@ int sctp_ulpq_tail_data(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, event = sctp_ulpq_reasm(ulpq, event); /* Do ordering if needed. */ - if ((event) && (event->msg_flags & MSG_EOR)) { + if (event) { /* Create a temporary list to collect chunks on. */ skb_queue_head_init(&temp); __skb_queue_tail(&temp, sctp_event2skb(event)); - event = sctp_ulpq_order(ulpq, event); + if (event->msg_flags & MSG_EOR) + event = sctp_ulpq_order(ulpq, event); } /* Send event to the ULP. 'event' is the sctp_ulpevent for |