Squash to "mptcp: sockopt: add SOL_IP freebind & transparent options"

[PATCH mptcp-next] Squash to "mptcp: sockopt: add SOL_IP freebind & transparent options"

Matthieu Baerts posted 1 patch 2 years, 5 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20211112104209.1991721-1-matthieu.baerts@tessares.net

Maintainers: "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Matthieu Baerts <matthieu.baerts@tessares.net>, Mat Martineau <mathew.j.martineau@linux.intel.com>

net/mptcp/sockopt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH mptcp-next] Squash to "mptcp: sockopt: add SOL_IP freebind & transparent options"

Posted by Matthieu Baerts 2 years, 5 months ago

Intel's kbuild found this warning:

   net/mptcp/sockopt.c:625:9: note: initialize the variable 'ret' to silence this warning
           int ret, err;
                  ^
                   = 0

We don't use 'ret' at all in this function, we can then remove it and
use '0' instead.

Fixes: 222f62c8bcf7 ("mptcp: sockopt: add SOL_IP freebind & transparent options")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
 net/mptcp/sockopt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index b818e91f2e09..fb43e145cb57 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -622,7 +622,7 @@ static int mptcp_setsockopt_sol_ip_set_transparent(struct mptcp_sock *msk, int o
 	struct sock *sk = (struct sock *)msk;
 	struct inet_sock *issk;
 	struct socket *ssock;
-	int ret, err;
+	int err;
 
 	err = ip_setsockopt(sk, SOL_IP, optname, optval, optlen);
 	if (err != 0)
@@ -653,7 +653,7 @@ static int mptcp_setsockopt_sol_ip_set_transparent(struct mptcp_sock *msk, int o
 
 	sockopt_seq_inc(msk);
 	release_sock(sk);
-	return ret;
+	return 0;
 }
 
 static int mptcp_setsockopt_v4_set_tos(struct mptcp_sock *msk, int optname,
-- 
2.32.0

Re: [PATCH mptcp-next] Squash to "mptcp: sockopt: add SOL_IP freebind & transparent options"

Posted by Matthieu Baerts 2 years, 5 months ago

Hello,

On 12/11/2021 11:42, Matthieu Baerts wrote:
> Intel's kbuild found this warning:
> 
>    net/mptcp/sockopt.c:625:9: note: initialize the variable 'ret' to silence this warning
>            int ret, err;
>                   ^
>                    = 0
> 
> We don't use 'ret' at all in this function, we can then remove it and
> use '0' instead.
> 
> Fixes: 222f62c8bcf7 ("mptcp: sockopt: add SOL_IP freebind & transparent options")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>

I just applied this patch in our tree:

- 5678002249d1: "squashed" in "mptcp: sockopt: add SOL_IP freebind &
transparent options"
- (I didn't add a Co-developed-by tag just for that)
- Results: ea9e134962cc..67feee727282

Builds and tests are now in progress:



https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20211112T105912

https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net