From: Geliang Tang <geliangtang@gmail.com>
Date: Mon, 15 Jun 2020 08:34:28 +0000 (+0800)
Subject: mptcp: use list_first_entry_or_null
X-Git-Tag: v5.8-rc2~26^2~22
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a386bc5b2155bf1fc76229481ac7e7f2a646d966;p=linux-2.6-block.git

mptcp: use list_first_entry_or_null

Use list_first_entry_or_null to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 70ed698bd206..db56535dfc29 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -232,10 +232,7 @@ static inline struct mptcp_data_frag *mptcp_rtx_head(const struct sock *sk)
 {
 	struct mptcp_sock *msk = mptcp_sk(sk);
 
-	if (list_empty(&msk->rtx_queue))
-		return NULL;
-
-	return list_first_entry(&msk->rtx_queue, struct mptcp_data_frag, list);
+	return list_first_entry_or_null(&msk->rtx_queue, struct mptcp_data_frag, list);
 }
 
 struct mptcp_subflow_request_sock {