Commit 03e7d28c authored by Matthieu Baerts's avatar Matthieu Baerts Committed by Jakub Kicinski
Browse files

mptcp: return 0 instead of 'err' var 



When 'err' is 0, it looks clearer to return '0' instead of the variable
called 'err'.

The behaviour is then not modified, just a clearer code.

By doing this, we can also avoid false positive smatch warnings like
this one:

  net/mptcp/pm_netlink.c:1169 mptcp_pm_parse_pm_addr_attr() warn: missing error code? 'err'

Reported-by: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Suggested-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8b34b52c

net/mptcp/pm_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[], 


	if (!tb[MPTCP_PM_ADDR_ATTR_FAMILY]) {

		if (!require_family)

			return err;

			return 0;



		NL_SET_ERR_MSG_ATTR(info->extack, attr,

				    "missing family");
@@ -1224,7 +1224,7 @@ static int mptcp_pm_parse_pm_addr_attr(struct nlattr *tb[], 
	if (tb[MPTCP_PM_ADDR_ATTR_PORT])

		addr->port = htons(nla_get_u16(tb[MPTCP_PM_ADDR_ATTR_PORT]));



	return err;

	return 0;

}



int mptcp_pm_parse_addr(struct nlattr *attr, struct genl_info *info,

net/mptcp/sockopt.c

+1 −1
Original line number Diff line number Diff line
@@ -740,7 +740,7 @@ static int mptcp_setsockopt_v4_set_tos(struct mptcp_sock *msk, int optname, 
	}

	release_sock(sk);



	return err;

	return 0;

}



static int mptcp_setsockopt_v4(struct mptcp_sock *msk, int optname,