Commit e8bc8f9a authored Sep 16, 2016 by Christophe Jaillet Committed by David S. Miller Sep 19, 2016

sctp: Remove some redundant code



In commit 311b2177 ("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>

parent 95357907

net/sctp/ulpqueue.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -140,11 +140,8 @@ int sctp_clear_pd(struct sock sk, struct sctp_association asoc)
		* we can go ahead and clear out the lobby in one shot
		*/
		if (!skb_queue_empty(&sp->pd_lobby)) {
		struct list_head *list;
		skb_queue_splice_tail_init(&sp->pd_lobby,
		&sk->sk_receive_queue);
		list = (struct list_head *)&sctp_sk(sk)->pd_lobby;
		INIT_LIST_HEAD(list);
		return 1;
		}
		} else {

Admin message