[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <adaocmy58hl.fsf@roland-alpha.cisco.com>
Date: Thu, 19 Nov 2009 16:45:58 -0800
From: Roland Dreier <rdreier@...co.com>
To: "Sean Hefty" <sean.hefty@...el.com>
Cc: "Stephen Rothwell" <sfr@...b.auug.org.au>,
<general@...ts.openfabrics.org>, <linux-next@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: linux-next: infiniband tree build failure
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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists