@@ -599,7 +599,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb,
if (msk && mp_opt->add_addr) {
if (mp_opt->family == MPTCP_ADDR_IPVERSION_4)
mptcp_pm_add_addr(msk, &mp_opt->addr, mp_opt->addr_id);
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
else if (mp_opt->family == MPTCP_ADDR_IPVERSION_6)
mptcp_pm_add_addr6(msk, &mp_opt->addr6,
mp_opt->addr_id);
@@ -35,7 +35,7 @@ int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr)
return err;
}
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr)
{
struct mptcp_sock *msk = mptcp_token_get_sock(token);
@@ -113,7 +113,7 @@ int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr)
return err;
}
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr)
{
struct mptcp_sock *msk = mptcp_token_get_sock(token);
@@ -224,7 +224,7 @@ void mptcp_pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr,
int mptcp_pm_addr_signal(struct mptcp_sock *msk, u8 *id,
struct sockaddr_storage *saddr)
{
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)saddr;
#endif
struct sockaddr_in *addr = (struct sockaddr_in *)saddr;
@@ -235,7 +235,7 @@ int mptcp_pm_addr_signal(struct mptcp_sock *msk, u8 *id,
if (msk->pm.local_family == AF_INET) {
addr->sin_family = msk->pm.local_family;
addr->sin_addr = msk->pm.local_addr;
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
} else if (msk->pm.local_family == AF_INET6) {
addr6->sin6_family = msk->pm.local_family;
addr6->sin6_addr = msk->pm.local_addr6;
@@ -89,7 +89,7 @@ struct mptcp_pm_data {
sa_family_t local_family;
union {
struct in_addr local_addr;
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
struct in6_addr local_addr6;
#endif
};
@@ -98,7 +98,7 @@ struct mptcp_pm_data {
sa_family_t remote_family;
union {
struct in_addr remote_addr;
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
struct in6_addr remote_addr6;
#endif
};
@@ -323,7 +323,7 @@ void mptcp_pm_add_addr6(struct mptcp_sock *msk, const struct in6_addr *addr,
int mptcp_pm_announce_addr(u32 token, u8 local_id, struct in_addr *addr);
int mptcp_pm_create_subflow(u32 token, u8 remote_id, struct in_addr *addr);
-#if IS_ENABLED(CONFIG_IPV6)
+#if IS_ENABLED(CONFIG_MPTCP_IPV6)
int mptcp_pm_announce_addr6(u32 token, u8 local_id, struct in6_addr *addr);
int mptcp_pm_create_subflow6(u32 token, u8 remote_id, struct in6_addr *addr);
#endif
squashto: Add Path Manager Interface Signed-off-by: Peter Krystad <peter.krystad@linux.intel.com> --- net/mptcp/options.c | 2 +- net/mptcp/pm.c | 8 ++++---- net/mptcp/protocol.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)