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

* [PATCH mptcp-next] Squash to "mptcp: sockopt: add SOL_IP freebind & transparent options"
@ 2021-11-12 10:42 Matthieu Baerts
  2021-11-12 11:00 ` Matthieu Baerts
  0 siblings, 1 reply; 2+ messages in thread
From: Matthieu Baerts @ 2021-11-12 10:42 UTC (permalink / raw)
  To: mptcp; +Cc: Matthieu Baerts, kernel test robot

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


^ permalink raw reply related	[flat|nested] 2+ messages in thread