>From 8465a7d33a36cf8a9a92fbeea5d8f3b89f30e632 Mon Sep 17 00:00:00 2001
From: Aleksey Senin <[EMAIL PROTECTED]>
Date: Wed, 26 Nov 2008 16:16:09 +0200
Subject: [PATCH] IPv6 local address resolution
RDMA CM support on local machine
Signed-off-by: Aleksey Senin <[EMAIL PROTECTED]>
---
drivers/infiniband/core/addr.c | 65 +++++++++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index f95d21f..1d785d7 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -279,29 +279,58 @@ static int addr_resolve_local(struct sockaddr *src_in,
struct rdma_dev_addr *addr)
{
struct net_device *dev;
- __be32 src_ip = ((struct sockaddr_in *)src_in)->sin_addr.s_addr;
- __be32 dst_ip = ((struct sockaddr_in *)dst_in)->sin_addr.s_addr;
- int ret;
+ int ret = -EADDRNOTAVAIL;
- dev = ip_dev_find(&init_net, dst_ip);
- if (!dev)
- return -EADDRNOTAVAIL;
+ if (dst_in->sa_family == AF_INET) {
+ __be32 src_ip = ((struct sockaddr_in *)src_in)->sin_addr.s_addr;
+ __be32 dst_ip = ((struct sockaddr_in *)dst_in)->sin_addr.s_addr;
- if (ipv4_is_zeronet(src_ip)) {
- src_in->sa_family = dst_in->sa_family;
- ((struct sockaddr_in *)src_in)->sin_addr.s_addr = dst_ip;
- ret = rdma_copy_addr(addr, dev, dev->dev_addr);
- } else if (ipv4_is_loopback(src_ip)) {
- ret = rdma_translate_ip(dst_in, addr);
- if (!ret)
- memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
+ dev = ip_dev_find(&init_net, dst_ip);
+ if (!dev)
+ return -EADDRNOTAVAIL;
+
+ if (ipv4_is_zeronet(src_ip)) {
+ src_in->sa_family = dst_in->sa_family;
+ ((struct sockaddr_in *)src_in)->sin_addr.s_addr =
dst_ip;
+ ret = rdma_copy_addr(addr, dev, dev->dev_addr);
+ } else if (ipv4_is_loopback(src_ip)) {
+ ret = rdma_translate_ip(dst_in, addr);
+ if (!ret)
+ memcpy(addr->dst_dev_addr, dev->dev_addr,
MAX_ADDR_LEN);
+ } else {
+ ret = rdma_translate_ip(src_in, addr);
+ if (!ret)
+ memcpy(addr->dst_dev_addr, dev->dev_addr,
MAX_ADDR_LEN);
+ }
+ dev_put(dev);
} else {
- ret = rdma_translate_ip(src_in, addr);
- if (!ret)
- memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
+ struct in6_addr *a = &((struct sockaddr_in6
*)dst_in)->sin6_addr;
+
+ for_each_netdev(&init_net, dev)
+ if (ipv6_chk_addr(&init_net, &((struct sockaddr_in6 *)
addr)->sin6_addr, dev, 1))
+ break;
+
+ if (!dev)
+ return -EADDRNOTAVAIL;
+
+ a = &((struct sockaddr_in6 *)src_in)->sin6_addr;
+
+ if (ipv6_addr_any(a)) {
+ src_in->sa_family = dst_in->sa_family;
+ ((struct sockaddr_in6 *)src_in)->sin6_addr =
+ ((struct sockaddr_in6 *)dst_in)->sin6_addr;
+ ret = rdma_copy_addr(addr, dev, dev->dev_addr);
+ } else if (ipv6_addr_loopback(a)) {
+ ret = rdma_translate_ip(dst_in, addr);
+ if (!ret)
+ memcpy(addr->dst_dev_addr, dev->dev_addr,
MAX_ADDR_LEN);
+ } else {
+ ret = rdma_translate_ip(src_in, addr);
+ if (!ret)
+ memcpy(addr->dst_dev_addr, dev->dev_addr,
MAX_ADDR_LEN);
+ }
}
- dev_put(dev);
return ret;
}
--
1.5.6.dirty
_______________________________________________
general mailing list
general@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
