diff mbox series

[v5,4/4] mptcp: remove MPTCP_ADD_ADDR_IPV6 and MPTCP_ADD_ADDR_PORT

Message ID 1624337135-149084-5-git-send-email-liyonglong@chinatelecom.cn (mailing list archive)
State Superseded, archived
Delegated to: Mat Martineau
Headers show
Series mptcp: fix conflicts when using pm.add_signal in ADD_ADDR/echo and RM_ADDR process | expand

Commit Message

YonglongLi June 22, 2021, 4:45 a.m. UTC 
there not need MPTCP_ADD_ADDR_PORT and MPTCP_ADD_ADDR_PORT, we can
get these info from pm.addr or pm.remote

Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
---
 net/mptcp/pm.c         |  4 ----
 net/mptcp/pm_netlink.c |  6 ++----
 net/mptcp/protocol.h   | 12 ------------
 3 files changed, 2 insertions(+), 20 deletions(-)

Comments

Geliang Tang June 25, 2021, 10:01 a.m. UTC | #1 
Yonglong Li <liyonglong@chinatelecom.cn> 于2021年6月22日周二 下午12:46写道：
>
> there not need MPTCP_ADD_ADDR_PORT and MPTCP_ADD_ADDR_PORT, we can
> get these info from pm.addr or pm.remote

There's no pm.addr, do you mean pm.local?


>
> Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
> ---
>  net/mptcp/pm.c         |  4 ----
>  net/mptcp/pm_netlink.c |  6 ++----
>  net/mptcp/protocol.h   | 12 ------------
>  3 files changed, 2 insertions(+), 20 deletions(-)
>
> diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
> index a62d4a5..f051e48 100644
> --- a/net/mptcp/pm.c
> +++ b/net/mptcp/pm.c
> @@ -35,10 +35,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;
>  }
> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
> index 0f302d2..bfa9d6d 100644
> --- a/net/mptcp/pm_netlink.c
> +++ b/net/mptcp/pm_netlink.c
> @@ -543,10 +543,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);
> diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
> index 90fb532..71e747c 100644
> --- a/net/mptcp/protocol.h
> +++ b/net/mptcp/protocol.h
> @@ -176,8 +176,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,
>  };
>
> @@ -723,16 +721,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);
> --
> 1.8.3.1
>
diff mbox series

Patch

diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c
index a62d4a5..f051e48 100644
--- a/net/mptcp/pm.c
+++ b/net/mptcp/pm.c
@@ -35,10 +35,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;
 }
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 0f302d2..bfa9d6d 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -543,10 +543,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);
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 90fb532..71e747c 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -176,8 +176,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,
 };
 
@@ -723,16 +721,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);