diff mbox series

[4/5] mptcp: Switch to CONFIG_MPTCP_IPV6

Message ID 20191105190557.6405-4-peter.krystad@linux.intel.com
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show
Series [1/5] mptcp: Make MPTCP IPv6 support depend on CONFIG_IPV6=y | expand

Commit Message

Peter Krystad Nov. 5, 2019, 7:05 p.m. UTC 
squashto: Add ADD_ADDR handling

Signed-off-by: Peter Krystad <peter.krystad@linux.intel.com>
---
 include/net/mptcp.h | 2 +-
 net/mptcp/options.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index eba39a881767..1196a5588ce1 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -35,7 +35,7 @@  struct mptcp_out_options {
 	u64 rcvr_key;
 	union {
 		struct in_addr addr;
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
 		struct in6_addr addr6;
 #endif
 	};
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 5b6df7aead1d..e050a3966280 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -223,7 +223,7 @@  void mptcp_parse_option(const unsigned char *ptr, int opsize,
 		if (mp_opt->family == MPTCP_ADDR_IPVERSION_4 &&
 		    opsize != TCPOLEN_MPTCP_ADD_ADDR)
 			break;
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
 		if (mp_opt->family == MPTCP_ADDR_IPVERSION_6 &&
 		    opsize != TCPOLEN_MPTCP_ADD_ADDR6)
 			break;
@@ -235,7 +235,7 @@  void mptcp_parse_option(const unsigned char *ptr, int opsize,
 			pr_debug("ADD_ADDR: addr=%x, id=%d",
 				 mp_opt->addr.s_addr, mp_opt->addr_id);
 		}
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
 		else {
 			mp_opt->add_addr = 1;
 			memcpy(mp_opt->addr6.s6_addr, (u8 *)ptr, 16);
@@ -472,7 +472,7 @@  static bool mptcp_established_options_addr(struct sock *sk,
 		opts->addr = ((struct sockaddr_in *)&saddr)->sin_addr;
 		*size = TCPOLEN_MPTCP_ADD_ADDR;
 	}
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
 	else if (saddr.ss_family == AF_INET6) {
 		if (remaining < TCPOLEN_MPTCP_ADD_ADDR6)
 			return false;
@@ -668,7 +668,7 @@  void mptcp_write_options(__be32 *ptr, struct mptcp_out_options *opts)
 		ptr += 1;
 	}
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
 	if (OPTION_MPTCP_ADD_ADDR6 & opts->suboptions) {
 		*ptr++ = mptcp_option(MPTCPOPT_ADD_ADDR,
 				      TCPOLEN_MPTCP_ADD_ADDR6,