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

mptcp: use adding up size to get ADD_ADDR length 



This patch uses adding up size to get the ADD_ADDR suboption length rather
than returning the ADD_ADDR size constants.

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

net/mptcp/protocol.h

+8 −4
Original line number Diff line number Diff line
@@ -577,10 +577,14 @@ static inline bool mptcp_pm_should_rm_signal(struct mptcp_sock *msk) 


static inline unsigned int mptcp_add_addr_len(int family, bool echo)

{

	if (family == AF_INET)

		return echo ? TCPOLEN_MPTCP_ADD_ADDR_BASE

			    : TCPOLEN_MPTCP_ADD_ADDR;

	return echo ? TCPOLEN_MPTCP_ADD_ADDR6_BASE : TCPOLEN_MPTCP_ADD_ADDR6;

	u8 len = TCPOLEN_MPTCP_ADD_ADDR_BASE;



	if (family == AF_INET6)

		len = TCPOLEN_MPTCP_ADD_ADDR6_BASE;

	if (!echo)

		len += MPTCPOPT_THMAC_LEN;



	return len;

}



bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,