Commit ee285257 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: drop flags and ifindex arguments 



This patch added a new helper mptcp_pm_get_flags_and_ifindex_by_id(),
and used it in __mptcp_subflow_connect() to get the flags and ifindex
values.

Then the two arguments flags and ifindex of __mptcp_subflow_connect()
can be dropped.

Signed-off-by: default avatarGeliang Tang <geliangtang@xiaomi.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3349d362

net/mptcp/pm_netlink.c

+23 −3
Original line number Diff line number Diff line
@@ -462,8 +462,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 
			check_work_pending(msk);

			remote_address((struct sock_common *)sk, &remote);

			spin_unlock_bh(&msk->pm.lock);

			__mptcp_subflow_connect(sk, &local->addr, &remote,

						local->flags, local->ifindex);

			__mptcp_subflow_connect(sk, &local->addr, &remote);

			spin_lock_bh(&msk->pm.lock);

			return;

		}
@@ -518,7 +517,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) 
	local.family = remote.family;



	spin_unlock_bh(&msk->pm.lock);

	__mptcp_subflow_connect(sk, &local, &remote, 0, 0);

	__mptcp_subflow_connect(sk, &local, &remote);

	spin_lock_bh(&msk->pm.lock);



add_addr_echo:
@@ -1105,6 +1104,27 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsigned int id) 
	return NULL;

}



int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,

					 u8 *flags, int *ifindex)

{

	struct mptcp_pm_addr_entry *entry;



	*flags = 0;

	*ifindex = 0;



	if (id) {

		rcu_read_lock();

		entry = __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id);

		if (entry) {

			*flags = entry->flags;

			*ifindex = entry->ifindex;

		}

		rcu_read_unlock();

	}



	return 0;

}



static bool remove_anno_list_by_saddr(struct mptcp_sock *msk,

				      struct mptcp_addr_info *addr)

{

net/mptcp/protocol.h

+3 −2
Original line number Diff line number Diff line
@@ -577,8 +577,7 @@ struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); 


/* called with sk socket lock held */

int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,

			    const struct mptcp_addr_info *remote,

			    u8 flags, int ifindex);

			    const struct mptcp_addr_info *remote);

int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);

void mptcp_info2sockaddr(const struct mptcp_addr_info *info,

			 struct sockaddr_storage *addr,
@@ -733,6 +732,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, 
struct mptcp_pm_add_entry *

mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk,

				struct mptcp_addr_info *addr);

int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id,

					 u8 *flags, int *ifindex);



int mptcp_pm_announce_addr(struct mptcp_sock *msk,

			   const struct mptcp_addr_info *addr,

net/mptcp/subflow.c

+5 −2
Original line number Diff line number Diff line
@@ -1355,8 +1355,7 @@ void mptcp_info2sockaddr(const struct mptcp_addr_info *info, 
}



int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,

			    const struct mptcp_addr_info *remote,

			    u8 flags, int ifindex)

			    const struct mptcp_addr_info *remote)

{

	struct mptcp_sock *msk = mptcp_sk(sk);

	struct mptcp_subflow_context *subflow;
@@ -1367,6 +1366,8 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, 
	struct sock *ssk;

	u32 remote_token;

	int addrlen;

	int ifindex;

	u8 flags;

	int err;



	if (!mptcp_is_fully_established(sk))
@@ -1390,6 +1391,8 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc, 
		local_id = err;

	}



	mptcp_pm_get_flags_and_ifindex_by_id(sock_net(sk), local_id,

					     &flags, &ifindex);

	subflow->remote_key = msk->remote_key;

	subflow->local_key = msk->local_key;

	subflow->token = msk->token;