From 8356b54f1819a4b260a55089aece8d02bba9fece Mon Sep 17 00:00:00 2001 From: Roland Dreier Date: Wed, 6 Jan 2010 13:16:47 -0800 Subject: [PATCH] --- yaml --- r: 178923 b: refs/heads/master c: 0139fd7c2ffd830e571d56f60198306ac24b726e h: refs/heads/master i: 178921: 1ba52f810440cfc86ae11b54017c1755b7886f97 178919: 7a96005bc55d08df759d8667a1a063358ba4c72a v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/cma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7394c4385322..f1fd6efdced2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4f77264cd1a858ee09da8dba5a2711a649adbf3 +refs/heads/master: 0139fd7c2ffd830e571d56f60198306ac24b726e diff --git a/trunk/drivers/infiniband/core/cma.c b/trunk/drivers/infiniband/core/cma.c index fbdd73106000..cc9b5940fa97 100644 --- a/trunk/drivers/infiniband/core/cma.c +++ b/trunk/drivers/infiniband/core/cma.c @@ -2083,7 +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) +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) struct sockaddr_in6 *sin6; if (addr->sa_family != AF_INET6)