[ofa-general] Re: linux-next: infiniband tree build failure
Roland Dreier
rdreier at cisco.com
Thu Nov 19 16:45:58 PST 2009
OK, so I threw this into the ipv6 patch, I think it's right:
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 71e616a..fbdd731 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2083,6 +2083,7 @@ static int cma_get_port(struct rdma_id_private *id_priv)
static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
struct sockaddr *addr)
{
+#if defined(CONFIG_IPv6) || defined(CONFIG_IPV6_MODULE)
struct sockaddr_in6 *sin6;
if (addr->sa_family != AF_INET6)
@@ -2094,6 +2095,7 @@ static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
return -EINVAL;
dev_addr->bound_dev_if = sin6->sin6_scope_id;
+#endif
return 0;
}
More information about the general
mailing list