Commit c233ef13 authored by Yonglong Li's avatar Yonglong Li Committed by David S. Miller
Browse files

mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT 



MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT are not necessary, we can get
these info from pm.local or pm.remote.

Drop mptcp_pm_should_add_signal_ipv6 and mptcp_pm_should_add_signal_port
too.

Co-developed-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarYonglong Li <liyonglong@chinatelecom.cn>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f462a446

net/mptcp/pm.c

+1 −5
Original line number Diff line number Diff line
@@ -37,10 +37,6 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, 
		msk->pm.local = *addr;

		add_addr |= BIT(MPTCP_ADD_ADDR_SIGNAL);

	}

	if (addr->family == AF_INET6)

		add_addr |= BIT(MPTCP_ADD_ADDR_IPV6);

	if (addr->port)

		add_addr |= BIT(MPTCP_ADD_ADDR_PORT);

	WRITE_ONCE(msk->pm.addr_signal, add_addr);

	return 0;

}
@@ -280,7 +276,7 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, 
	}



	*echo = mptcp_pm_should_add_signal_echo(msk);

	*port = mptcp_pm_should_add_signal_port(msk);

	*port = !!(*echo ? msk->pm.remote.port : msk->pm.local.port);



	family = *echo ? msk->pm.remote.family : msk->pm.local.family;

	if (remaining < mptcp_add_addr_len(family, *echo, *port))

net/mptcp/pm_netlink.c

+2 −4
Original line number Diff line number Diff line
@@ -647,10 +647,8 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) 
		bool slow;



		spin_unlock_bh(&msk->pm.lock);

		pr_debug("send ack for %s%s%s",

			 mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr",

			 mptcp_pm_should_add_signal_ipv6(msk) ? " [ipv6]" : "",

			 mptcp_pm_should_add_signal_port(msk) ? " [port]" : "");

		pr_debug("send ack for %s",

			 mptcp_pm_should_add_signal(msk) ? "add_addr" : "rm_addr");



		slow = lock_sock_fast(ssk);

		tcp_send_ack(ssk);

net/mptcp/protocol.h

+0 −12
Original line number Diff line number Diff line
@@ -178,8 +178,6 @@ enum mptcp_pm_status { 
enum mptcp_addr_signal_status {

	MPTCP_ADD_ADDR_SIGNAL,

	MPTCP_ADD_ADDR_ECHO,

	MPTCP_ADD_ADDR_IPV6,

	MPTCP_ADD_ADDR_PORT,

	MPTCP_RM_ADDR_SIGNAL,

};
@@ -762,16 +760,6 @@ static inline bool mptcp_pm_should_add_signal_echo(struct mptcp_sock *msk) 
	return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_ECHO);

}



static inline bool mptcp_pm_should_add_signal_ipv6(struct mptcp_sock *msk)

{

	return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_IPV6);

}



static inline bool mptcp_pm_should_add_signal_port(struct mptcp_sock *msk)

{

	return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_ADD_ADDR_PORT);

}



static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk)

{

	return READ_ONCE(msk->pm.addr_signal) & BIT(MPTCP_RM_ADDR_SIGNAL);