* [PATCH v5 3/5] sctp: Use helper for sctp_ulpq_tail_event() when hooked up to ->enqueue_event
@ 2019-04-11 22:02 David Miller
2019-04-11 22:18 ` Marcelo Ricardo Leitner
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2019-04-11 22:02 UTC (permalink / raw)
To: netdev; +Cc: marcelo.leitner, lucien.xin, nhorman
This way we can make sure events sent this way to
sctp_ulpq_tail_event() are on a list as well. Now all such code paths
are fully covered.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/sctp/stream_interleave.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
index 102c6fefe38c..a6bc42121e35 100644
--- a/net/sctp/stream_interleave.c
+++ b/net/sctp/stream_interleave.c
@@ -1298,6 +1298,15 @@ static void sctp_handle_iftsn(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk)
ntohl(skip->mid), skip->flags);
}
+static int do_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
+{
+ struct sk_buff_head temp;
+
+ skb_queue_head_init(&temp);
+ __skb_queue_tail(&temp, sctp_event2skb(event));
+ return sctp_ulpq_tail_event(ulpq, event);
+}
+
static struct sctp_stream_interleave sctp_stream_interleave_0 = {
.data_chunk_len = sizeof(struct sctp_data_chunk),
.ftsn_chunk_len = sizeof(struct sctp_fwdtsn_chunk),
@@ -1306,7 +1315,7 @@ static struct sctp_stream_interleave sctp_stream_interleave_0 = {
.assign_number = sctp_chunk_assign_ssn,
.validate_data = sctp_validate_data,
.ulpevent_data = sctp_ulpq_tail_data,
- .enqueue_event = sctp_ulpq_tail_event,
+ .enqueue_event = do_ulpq_tail_event,
.renege_events = sctp_ulpq_renege,
.start_pd = sctp_ulpq_partial_delivery,
.abort_pd = sctp_ulpq_abort_pd,
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v5 3/5] sctp: Use helper for sctp_ulpq_tail_event() when hooked up to ->enqueue_event
2019-04-11 22:02 [PATCH v5 3/5] sctp: Use helper for sctp_ulpq_tail_event() when hooked up to ->enqueue_event David Miller
@ 2019-04-11 22:18 ` Marcelo Ricardo Leitner
0 siblings, 0 replies; 3+ messages in thread
From: Marcelo Ricardo Leitner @ 2019-04-11 22:18 UTC (permalink / raw)
To: David Miller; +Cc: netdev, lucien.xin, nhorman
On Thu, Apr 11, 2019 at 03:02:01PM -0700, David Miller wrote:
>
> This way we can make sure events sent this way to
> sctp_ulpq_tail_event() are on a list as well. Now all such code paths
> are fully covered.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
> ---
> net/sctp/stream_interleave.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
> index 102c6fefe38c..a6bc42121e35 100644
> --- a/net/sctp/stream_interleave.c
> +++ b/net/sctp/stream_interleave.c
> @@ -1298,6 +1298,15 @@ static void sctp_handle_iftsn(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk)
> ntohl(skip->mid), skip->flags);
> }
>
> +static int do_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
> +{
> + struct sk_buff_head temp;
> +
> + skb_queue_head_init(&temp);
> + __skb_queue_tail(&temp, sctp_event2skb(event));
> + return sctp_ulpq_tail_event(ulpq, event);
> +}
> +
> static struct sctp_stream_interleave sctp_stream_interleave_0 = {
> .data_chunk_len = sizeof(struct sctp_data_chunk),
> .ftsn_chunk_len = sizeof(struct sctp_fwdtsn_chunk),
> @@ -1306,7 +1315,7 @@ static struct sctp_stream_interleave sctp_stream_interleave_0 = {
> .assign_number = sctp_chunk_assign_ssn,
> .validate_data = sctp_validate_data,
> .ulpevent_data = sctp_ulpq_tail_data,
> - .enqueue_event = sctp_ulpq_tail_event,
> + .enqueue_event = do_ulpq_tail_event,
> .renege_events = sctp_ulpq_renege,
> .start_pd = sctp_ulpq_partial_delivery,
> .abort_pd = sctp_ulpq_abort_pd,
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v5 3/5] sctp: Use helper for sctp_ulpq_tail_event() when hooked up to ->enqueue_event
@ 2019-04-10 21:20 David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2019-04-10 21:20 UTC (permalink / raw)
To: netdev
This way we can make sure events sent this way to
sctp_ulpq_tail_event() are on a list as well. Now all such code paths
are fully covered.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/sctp/stream_interleave.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c
index 102c6fefe38c..a6bc42121e35 100644
--- a/net/sctp/stream_interleave.c
+++ b/net/sctp/stream_interleave.c
@@ -1298,6 +1298,15 @@ static void sctp_handle_iftsn(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk)
ntohl(skip->mid), skip->flags);
}
+static int do_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
+{
+ struct sk_buff_head temp;
+
+ skb_queue_head_init(&temp);
+ __skb_queue_tail(&temp, sctp_event2skb(event));
+ return sctp_ulpq_tail_event(ulpq, event);
+}
+
static struct sctp_stream_interleave sctp_stream_interleave_0 = {
.data_chunk_len = sizeof(struct sctp_data_chunk),
.ftsn_chunk_len = sizeof(struct sctp_fwdtsn_chunk),
@@ -1306,7 +1315,7 @@ static struct sctp_stream_interleave sctp_stream_interleave_0 = {
.assign_number = sctp_chunk_assign_ssn,
.validate_data = sctp_validate_data,
.ulpevent_data = sctp_ulpq_tail_data,
- .enqueue_event = sctp_ulpq_tail_event,
+ .enqueue_event = do_ulpq_tail_event,
.renege_events = sctp_ulpq_renege,
.start_pd = sctp_ulpq_partial_delivery,
.abort_pd = sctp_ulpq_abort_pd,
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-11 22:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-11 22:02 [PATCH v5 3/5] sctp: Use helper for sctp_ulpq_tail_event() when hooked up to ->enqueue_event David Miller
2019-04-11 22:18 ` Marcelo Ricardo Leitner
-- strict thread matches above, loose matches on Subject: below --
2019-04-10 21:20 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).