Commit 2c8971c0 authored by Geliang Tang's avatar Geliang Tang Committed by Paolo Abeni
Browse files

mptcp: pm: drop skb parameter of set_flags 



The first parameter 'skb' in mptcp_pm_nl_set_flags() is only used to
obtained the network namespace, which can also be obtained through the
second parameters 'info' by using genl_info_net() helper.

This patch drops these useless parameters 'skb' in all three set_flags()
interfaces.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 8556f4ae

net/mptcp/pm.c

+4 −4
Original line number Diff line number Diff line
@@ -504,16 +504,16 @@ int mptcp_pm_nl_get_addr_dumpit(struct sk_buff *msg, 
	return mptcp_pm_dump_addr(msg, cb);

}



static int mptcp_pm_set_flags(struct sk_buff *skb, struct genl_info *info)

static int mptcp_pm_set_flags(struct genl_info *info)

{

	if (info->attrs[MPTCP_PM_ATTR_TOKEN])

		return mptcp_userspace_pm_set_flags(skb, info);

	return mptcp_pm_nl_set_flags(skb, info);

		return mptcp_userspace_pm_set_flags(info);

	return mptcp_pm_nl_set_flags(info);

}



int mptcp_pm_nl_set_flags_doit(struct sk_buff *skb, struct genl_info *info)

{

	return mptcp_pm_set_flags(skb, info);

	return mptcp_pm_set_flags(info);

}



void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk)

net/mptcp/pm_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -1951,12 +1951,12 @@ static int mptcp_nl_set_flags(struct net *net, 
	return ret;

}



int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info)

int mptcp_pm_nl_set_flags(struct genl_info *info)

{

	struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, };

	u8 changed, mask = MPTCP_PM_ADDR_FLAG_BACKUP |

			   MPTCP_PM_ADDR_FLAG_FULLMESH;

	struct net *net = sock_net(skb->sk);

	struct net *net = genl_info_net(info);

	struct mptcp_pm_addr_entry *entry;

	struct pm_nl_pernet *pernet;

	struct nlattr *attr;

net/mptcp/pm_userspace.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ int mptcp_pm_nl_subflow_destroy_doit(struct sk_buff *skb, struct genl_info *info 
	return err;

}



int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info)

int mptcp_userspace_pm_set_flags(struct genl_info *info)

{

	struct mptcp_pm_addr_entry loc = { .addr = { .family = AF_UNSPEC }, };

	struct mptcp_pm_addr_entry rem = { .addr = { .family = AF_UNSPEC }, };

net/mptcp/protocol.h

+2 −2
Original line number Diff line number Diff line
@@ -1038,8 +1038,8 @@ bool mptcp_lookup_subflow_by_saddr(const struct list_head *list, 
				   const struct mptcp_addr_info *saddr);

bool mptcp_remove_anno_list_by_saddr(struct mptcp_sock *msk,

				     const struct mptcp_addr_info *addr);

int mptcp_pm_nl_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_userspace_pm_set_flags(struct sk_buff *skb, struct genl_info *info);

int mptcp_pm_nl_set_flags(struct genl_info *info);

int mptcp_userspace_pm_set_flags(struct genl_info *info);

int mptcp_pm_announce_addr(struct mptcp_sock *msk,

			   const struct mptcp_addr_info *addr,

			   bool echo);