Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 15 Jun 2020 16:48:55 +0800
From:   Geliang Tang <geliangtang@gmail.com>
To:     Mat Martineau <mathew.j.martineau@linux.intel.com>
Cc:     Matthieu Baerts <matthieu.baerts@tessares.net>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Peter Krystad <peter.krystad@linux.intel.com>,
        netdev@vger.kernel.org, mptcp@lists.01.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mptcp: use list_first_entry_or_null
Message-ID: <20200615084855.GB29964@OptiPlex>
References: <9958d3f15d2d181eb9d48ffe5bf3251ec900f27a.1591941826.git.geliangtang@gmail.com>
 <alpine.OSX.2.22.394.2006121114030.74555@mjmartin-mac01.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.OSX.2.22.394.2006121114030.74555@mjmartin-mac01.local>
User-Agent: Mutt/1.9.4 (2018-02-28)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Fri, Jun 12, 2020 at 11:22:31AM -0700, Mat Martineau wrote:
> 
> Hello Geliang,
> 
> On Fri, 12 Jun 2020, Geliang Tang wrote:
> 
> > Use list_first_entry_or_null to simplify the code.
> > 
> > Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> > ---
> > net/mptcp/protocol.h | 5 +----
> > 1 file changed, 1 insertion(+), 4 deletions(-)
> > 
> > diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> > index 86d265500cf6..55c65abcad64 100644
> > --- a/net/mptcp/protocol.h
> > +++ b/net/mptcp/protocol.h
> > @@ -234,10 +234,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 {
> > -- 
> > 2.17.1
> 
> As Matthieu mentioned on your earlier patch, please submit patches to netdev
> with either a [PATCH net] or [PATCH net-next] tag. In this case, these are
> non-critical bug fixes so they should be targeted at net-next.
> 
> Note that net-next branch is currently closed to submissions due to the v5.8
> merge window. Please resubmit both MPTCP patches for net-next when David
> announces that it is open again. The change does look ok but will not be
> merged now.
> 
> Thanks for your patch,
> 
> --
> Mat Martineau
> Intel

Hi Mat,

Thanks for your reply.
I have already resend patch v2 to you.

-Geliang