Fix redundant scheduler for the rt-tree based retransmit queue

With 75c119a, a new rt-tree based retransmit queue was introduced. This breaks the assumptions of the redundant scheduler and leads to failures when the scheduler trys to schedule the next packet b ased on the skbs in the send queue. This commit fixes #297 Fixes: c61bc63 ("Merge tag 'v4.15-rc3' into mptcp_trunk") Signed-off-by: AlexanderFroemmgen <[email protected]> Signed-off-by: Christoph Paasch <[email protected]>
multipath-tcp · Dec 12, 2018 · f6efc9d · f6efc9d
1 parent e7ca428
commit f6efc9d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/net/mptcp/mptcp_redundant.c b/net/mptcp/mptcp_redundant.c
@@ -196,15 +196,11 @@ static struct sk_buff *redundant_next_skb_from_queue(struct sk_buff_head *queue,
 						     struct sk_buff *previous,
 						     struct sock *meta_sk)
 {
-	if (skb_queue_empty(queue))
-		return NULL;
+	struct sk_buff *skb;
 
 	if (!previous)
 		return skb_peek(queue);
 
-	if (skb_queue_is_last(queue, previous))
-		return NULL;
-
 	/* sk_data->skb stores the last scheduled packet for this subflow.
 	 * If sk_data->skb was scheduled but not sent (e.g., due to nagle),
 	 * we have to schedule it again.
@@ -225,7 +221,11 @@ static struct sk_buff *redundant_next_skb_from_queue(struct sk_buff_head *queue,
 	if (tcp_send_head(meta_sk) == previous)
 		return tcp_send_head(meta_sk);
 
-	return skb_queue_next(queue, previous);
+	skb = skb_rb_next(previous);
+	if (skb)
+		return skb;
+
+	return tcp_send_head(meta_sk);
 }
 
 static struct sk_buff *redundant_next_segment(struct sock *meta_sk,