mptcp: drop MPTCP_ADDR_IPVERSION_4/6

Since the type of the address family in struct mptcp_options_received
became sa_family_t, we should set AF_INET/AF_INET6 to it, instead of
using MPTCP_ADDR_IPVERSION_4/6.

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>

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 8d28f2e0de8283c37dee7514b81427f645c24bde..3bdb92a3b4809e7e94d895a5936df2b44dc08555 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -220,22 +220,22 @@ static void mptcp_parse_option(const struct sk_buff *skb,
                if (!mp_opt->echo) {
                        if (opsize == TCPOLEN_MPTCP_ADD_ADDR ||
                            opsize == TCPOLEN_MPTCP_ADD_ADDR_PORT)
-                               mp_opt->addr.family = MPTCP_ADDR_IPVERSION_4;
+                               mp_opt->addr.family = AF_INET;
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
                        else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6 ||
                                 opsize == TCPOLEN_MPTCP_ADD_ADDR6_PORT)
-                               mp_opt->addr.family = MPTCP_ADDR_IPVERSION_6;
+                               mp_opt->addr.family = AF_INET6;
 #endif
                        else
                                break;
                } else {
                        if (opsize == TCPOLEN_MPTCP_ADD_ADDR_BASE ||
                            opsize == TCPOLEN_MPTCP_ADD_ADDR_BASE_PORT)
-                               mp_opt->addr.family = MPTCP_ADDR_IPVERSION_4;
+                               mp_opt->addr.family = AF_INET;
 #if IS_ENABLED(CONFIG_MPTCP_IPV6)
                        else if (opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE ||
                                 opsize == TCPOLEN_MPTCP_ADD_ADDR6_BASE_PORT)
-                               mp_opt->addr.family = MPTCP_ADDR_IPVERSION_6;
+                               mp_opt->addr.family = AF_INET6;
 #endif
                        else
                                break;
@@ -243,7 +243,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
 
                mp_opt->add_addr = 1;
                mp_opt->addr.id = *ptr++;
-               if (mp_opt->addr.family == MPTCP_ADDR_IPVERSION_4) {
+               if (mp_opt->addr.family == AF_INET) {
                        memcpy((u8 *)&mp_opt->addr.addr.s_addr, (u8 *)ptr, 4);
                        ptr += 4;
                        if (opsize == TCPOLEN_MPTCP_ADD_ADDR_PORT ||
@@ -268,7 +268,7 @@ static void mptcp_parse_option(const struct sk_buff *skb,
                        ptr += 8;
                }
                pr_debug("ADD_ADDR%s: id=%d, ahmac=%llu, echo=%d, port=%d",
-                        (mp_opt->addr.family == MPTCP_ADDR_IPVERSION_6) ? "6" : "",
+                        (mp_opt->addr.family == AF_INET6) ? "6" : "",
                         mp_opt->addr.id, mp_opt->ahmac, mp_opt->echo, ntohs(mp_opt->addr.port));
                break;
 
@@ -991,7 +991,7 @@ static bool add_addr_hmac_valid(struct mptcp_sock *msk,
        if (mp_opt->echo)
                return true;
 
-       if (mp_opt->addr.family == MPTCP_ADDR_IPVERSION_4)
+       if (mp_opt->addr.family == AF_INET)
                hmac = add_addr_generate_hmac(msk->remote_key,
                                              msk->local_key,
                                              mp_opt->addr.id, &mp_opt->addr.addr,

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index ca3013facbbab36e09c3d8ce8f862a495b234c00..d8de1e961ab0a86482068beed530cf19243d468a 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -90,8 +90,6 @@
 
 /* MPTCP ADD_ADDR flags */
 #define MPTCP_ADDR_ECHO                BIT(0)
-#define MPTCP_ADDR_IPVERSION_4 4
-#define MPTCP_ADDR_IPVERSION_6 6
 
 /* MPTCP MP_PRIO flags */
 #define MPTCP_PRIO_BKUP                BIT(0)