mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
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: Geliang Tang <geliangtang@gmail.com> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
22fb85ffae
commit
2ec72faec8
1 changed files with 8 additions and 4 deletions
|
@ -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)
|
static inline unsigned int mptcp_add_addr_len(int family, bool echo)
|
||||||
{
|
{
|
||||||
if (family == AF_INET)
|
u8 len = TCPOLEN_MPTCP_ADD_ADDR_BASE;
|
||||||
return echo ? TCPOLEN_MPTCP_ADD_ADDR_BASE
|
|
||||||
: TCPOLEN_MPTCP_ADD_ADDR;
|
if (family == AF_INET6)
|
||||||
return echo ? TCPOLEN_MPTCP_ADD_ADDR6_BASE : TCPOLEN_MPTCP_ADD_ADDR6;
|
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,
|
bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining,
|
||||||
|
|
Loading…
Reference in a new issue