Commit 528cb5f2 authored by Geliang Tang's avatar Geliang Tang Committed by Jakub Kicinski
Browse files

mptcp: pass addr to mptcp_pm_alloc_anno_list 



Pass addr parameter to mptcp_pm_alloc_anno_list() instead of entry. We
can reduce the scope, e.g. in mptcp_pm_alloc_anno_list(), we only access
"entry->addr", we can then restrict to the pointer to "addr" then.

Signed-off-by: default avatarGeliang Tang <geliang.tang@suse.com>
Reviewed-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarMatthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bbd49d11

net/mptcp/pm_netlink.c

+4 −4
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, 
}



bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,

			      const struct mptcp_pm_addr_entry *entry)

			      const struct mptcp_addr_info *addr)

{

	struct mptcp_pm_add_entry *add_entry = NULL;

	struct sock *sk = (struct sock *)msk;
@@ -349,7 +349,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, 


	lockdep_assert_held(&msk->pm.lock);



	add_entry = mptcp_lookup_anno_list_by_saddr(msk, &entry->addr);

	add_entry = mptcp_lookup_anno_list_by_saddr(msk, addr);



	if (add_entry) {

		if (mptcp_pm_is_kernel(msk))
@@ -366,7 +366,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, 


	list_add(&add_entry->list, &msk->pm.anno_list);



	add_entry->addr = entry->addr;

	add_entry->addr = *addr;

	add_entry->sock = msk;

	add_entry->retrans_times = 0;
@@ -576,7 +576,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 
			return;



		if (local) {

			if (mptcp_pm_alloc_anno_list(msk, local)) {

			if (mptcp_pm_alloc_anno_list(msk, &local->addr)) {

				__clear_bit(local->addr.id, msk->pm.id_avail_bitmap);

				msk->pm.add_addr_signaled++;

				mptcp_pm_announce_addr(msk, &local->addr, false);

net/mptcp/pm_userspace.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info) 
	lock_sock((struct sock *)msk);

	spin_lock_bh(&msk->pm.lock);



	if (mptcp_pm_alloc_anno_list(msk, &addr_val)) {

	if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) {

		msk->pm.add_addr_signaled++;

		mptcp_pm_announce_addr(msk, &addr_val.addr, false);

		mptcp_pm_nl_addr_send_ack(msk);

net/mptcp/protocol.h

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, 
				 struct mptcp_addr_info *rem,

				 u8 bkup);

bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk,

			      const struct mptcp_pm_addr_entry *entry);

			      const struct mptcp_addr_info *addr);

void mptcp_pm_free_anno_list(struct mptcp_sock *msk);

bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock *sk);

struct mptcp_pm_add_entry *