Re: [PATCH mptcp-next] Squash to "mptcp: pm: add id parameter for get_addr"

[Matthieu Baerts <matttbe@kernel.org>]

Hi Geliang,

On 18/01/2025 11:54, Geliang Tang wrote:
> Hi Matt,
> 
> On Sat, 2025-01-18 at 08:50 +0100, Matthieu Baerts wrote:
>> Hi Geliang,
>>
>> On 18/01/2025 00:26, Geliang Tang wrote:
>>> From: Geliang Tang <tanggeliang@kylinos.cn>
>>>
>>> No need to drop 'attr = info->attrs[MPTCP_PM_ENDPOINT_ADDR];' in
>>> mptcp_userspace_pm_get_addr() too, add it back.
>>>
>>> Alse update mptcp_pm_nl_get_addr() to keep the original two-line
>>> assignment of 'attr'.
>>
>> I did a simple fix instead, see 648a0809e4cf ("Squash to "mptcp: pm:
>> add
>> id parameter for get_addr"") and the final export branch. Tell me if
>> that's not OK.
> 
> It works.
> 
> But we just change
> 
> 	struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN];
> 
> to
> 	struct nlattr *token;
> 
> 	token = info->attrs[MPTCP_PM_ATTR_TOKEN];
> 
> in patch 5 "mptcp: pm: userspace: use GENL_REQ_ATTR_CHECK".
> 
> We change it back again in this patch 11.
> 
> So I prefer to use the two-line assignment of 'attr'. But up to you.

I see, it makes sense. But well, at the end, this code is going to be
moved elsewhere. Because the modifications have already been done
internally, I think it is fine to leave them like that, and avoid
dealing with new conflicts.

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.