| Message ID | 20250117-mptcp-issue-540-v2-2-a194740fb380@kernel.org (mailing list archive) |
|---|---|
| State | Queued |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | mptcp: pm: only set fullmesh for subflow endp | expand |
| Context | Check | Description |
|---|---|---|
| matttbe/build | success | Build and static analysis OK |
| matttbe/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 31 lines checked |
| matttbe/shellcheck | success | MPTCP selftests files have not been modified |
| matttbe/KVM_Validation__normal | success | Success! ✅ |
| matttbe/KVM_Validation__debug | fail | Critical: 1 Call Trace(s) ❌ |
| matttbe/KVM_Validation__btf-normal__only_bpftest_all_ | success | Success! ✅ |
| matttbe/KVM_Validation__btf-debug__only_bpftest_all_ | success | Success! ✅ |
On Fri, 17 Jan 2025, Matthieu Baerts (NGI0) wrote: > The returned value is not used, it can then be dropped. > > Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> Thanks Matthieu Reviewed-by: Mat Martineau <martineau@kernel.org> > --- > net/mptcp/pm_netlink.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c > index 99705a9c2238c6be96e320e8cd1d12bfa0e0e7f0..ff1e5695dc1db5e32d5f45bef7cf22e43aea0ef1 100644 > --- a/net/mptcp/pm_netlink.c > +++ b/net/mptcp/pm_netlink.c > @@ -1922,13 +1922,11 @@ static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk, > spin_unlock_bh(&msk->pm.lock); > } > > -static int mptcp_nl_set_flags(struct net *net, > - struct mptcp_addr_info *addr, > - u8 bkup, u8 changed) > +static void mptcp_nl_set_flags(struct net *net, struct mptcp_addr_info *addr, > + u8 bkup, u8 changed) > { > long s_slot = 0, s_num = 0; > struct mptcp_sock *msk; > - int ret = -EINVAL; > > while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) { > struct sock *sk = (struct sock *)msk; > @@ -1938,7 +1936,7 @@ static int mptcp_nl_set_flags(struct net *net, > > lock_sock(sk); > if (changed & MPTCP_PM_ADDR_FLAG_BACKUP) > - ret = mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup); > + mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup); > if (changed & MPTCP_PM_ADDR_FLAG_FULLMESH) > mptcp_pm_nl_fullmesh(msk, addr); > release_sock(sk); > @@ -1948,7 +1946,7 @@ static int mptcp_nl_set_flags(struct net *net, > cond_resched(); > } > > - return ret; > + return; > } > > int mptcp_pm_nl_set_flags(struct mptcp_pm_addr_entry *local, > > -- > 2.47.1 > > >
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 99705a9c2238c6be96e320e8cd1d12bfa0e0e7f0..ff1e5695dc1db5e32d5f45bef7cf22e43aea0ef1 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1922,13 +1922,11 @@ static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk, spin_unlock_bh(&msk->pm.lock); } -static int mptcp_nl_set_flags(struct net *net, - struct mptcp_addr_info *addr, - u8 bkup, u8 changed) +static void mptcp_nl_set_flags(struct net *net, struct mptcp_addr_info *addr, + u8 bkup, u8 changed) { long s_slot = 0, s_num = 0; struct mptcp_sock *msk; - int ret = -EINVAL; while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) { struct sock *sk = (struct sock *)msk; @@ -1938,7 +1936,7 @@ static int mptcp_nl_set_flags(struct net *net, lock_sock(sk); if (changed & MPTCP_PM_ADDR_FLAG_BACKUP) - ret = mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup); + mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup); if (changed & MPTCP_PM_ADDR_FLAG_FULLMESH) mptcp_pm_nl_fullmesh(msk, addr); release_sock(sk); @@ -1948,7 +1946,7 @@ static int mptcp_nl_set_flags(struct net *net, cond_resched(); } - return ret; + return; } int mptcp_pm_nl_set_flags(struct mptcp_pm_addr_entry *local,
The returned value is not used, it can then be dropped. Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> --- net/mptcp/pm_netlink.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)