From: Roland Dreier <rdreier@cisco.com>
To: Sean Hefty <sean.hefty@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
general@lists.openfabrics.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: linux-next: infiniband tree build failure
Date: Thu, 19 Nov 2009 16:45:58 -0800 [thread overview]
Message-ID: <adaocmy58hl.fsf@roland-alpha.cisco.com> (raw)
In-Reply-To: <6307584467EB4D168602C43E0B185157@amr.corp.intel.com> (Sean Hefty's message of "Thu, 19 Nov 2009 16:30:55 -0800")
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;
}
WARNING: multiple messages have this Message-ID (diff)
From: Roland Dreier <rdreier@cisco.com>
To: "Sean Hefty" <sean.hefty@intel.com>
Cc: "Stephen Rothwell" <sfr@canb.auug.org.au>,
<general@lists.openfabrics.org>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: linux-next: infiniband tree build failure
Date: Thu, 19 Nov 2009 16:45:58 -0800 [thread overview]
Message-ID: <adaocmy58hl.fsf@roland-alpha.cisco.com> (raw)
In-Reply-To: <6307584467EB4D168602C43E0B185157@amr.corp.intel.com> (Sean Hefty's message of "Thu, 19 Nov 2009 16:30:55 -0800")
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;
}
next prev parent reply other threads:[~2009-11-20 0:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-20 0:03 linux-next: infiniband tree build failure Stephen Rothwell
2009-11-20 0:19 ` Roland Dreier
2009-11-20 0:30 ` Sean Hefty
2009-11-20 0:30 ` Sean Hefty
2009-11-20 0:43 ` Roland Dreier
2009-11-20 0:43 ` Roland Dreier
2009-11-20 0:45 ` Roland Dreier [this message]
2009-11-20 0:45 ` Roland Dreier
2009-11-20 0:52 ` Sean Hefty
2009-11-20 0:52 ` Sean Hefty
2009-11-20 0:34 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-05-08 1:53 Stephen Rothwell
2009-04-29 4:01 Stephen Rothwell
2009-04-29 16:51 ` Roland Dreier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=adaocmy58hl.fsf@roland-alpha.cisco.com \
--to=rdreier@cisco.com \
--cc=general@lists.openfabrics.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sean.hefty@intel.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.