diff options
author | Christophe Jaillet <christophe.jaillet@wanadoo.fr> | 2016-09-16 17:05:35 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-19 01:34:01 -0400 |
commit | e8bc8f9a670e26e91562e724a2114243898bd616 (patch) | |
tree | abee5fd4bde082316572a20fd09467050451e7bf /net/sctp/ulpqueue.c | |
parent | 95357907ae73a8039c2106897ee2694f26ac3caf (diff) |
sctp: Remove some redundant code
In commit 311b21774f13 ("sctp: simplify sk_receive_queue locking"), a call
to 'skb_queue_splice_tail_init()' has been made explicit. Previously it was
hidden in 'sctp_skb_list_tail()'
Now, the code around it looks redundant. The '_init()' part of
'skb_queue_splice_tail_init()' should already do the same.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
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 'net/sctp/ulpqueue.c')
-rw-r--r-- | net/sctp/ulpqueue.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index 877e55066f89..84d0fdaf7de9 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c | |||
@@ -140,11 +140,8 @@ int sctp_clear_pd(struct sock *sk, struct sctp_association *asoc) | |||
140 | * we can go ahead and clear out the lobby in one shot | 140 | * we can go ahead and clear out the lobby in one shot |
141 | */ | 141 | */ |
142 | if (!skb_queue_empty(&sp->pd_lobby)) { | 142 | if (!skb_queue_empty(&sp->pd_lobby)) { |
143 | struct list_head *list; | ||
144 | skb_queue_splice_tail_init(&sp->pd_lobby, | 143 | skb_queue_splice_tail_init(&sp->pd_lobby, |
145 | &sk->sk_receive_queue); | 144 | &sk->sk_receive_queue); |
146 | list = (struct list_head *)&sctp_sk(sk)->pd_lobby; | ||
147 | INIT_LIST_HEAD(list); | ||
148 | return 1; | 145 | return 1; |
149 | } | 146 | } |
150 | } else { | 147 | } else { |