>From f31fc16d06a5f02a7d362ae6ee688b1dc039b0a6 Mon Sep 17 00:00:00 2001
From: Aleksey Senin <[EMAIL PROTECTED]>
Date: Thu, 7 Aug 2008 10:04:17 +0300
Subject: [IPv6 RDMA CM PATCHv2 7/8]
IPv6 support in addr_resolve_local function
New cma_ipv6_dev_find function for searching device with specified network
address ( like ip_dev_find in IPv4 )
I'm in doubt if it really should be realized as function, but I used it more
then once so...
Signed-off-by: Aleksey Senin <[EMAIL PROTECTED]>
---
drivers/infiniband/core/addr.c | 94 ++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 27 deletions(-)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index f95d21f..00dcb22 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -111,6 +111,15 @@ int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct
net_device *dev,
}
EXPORT_SYMBOL(rdma_copy_addr);
+static inline struct net_device *cma_ipv6_dev_find(struct in6_addr *addr)
+{
+ struct net_device *dev = 0;
+ for_each_netdev(&init_net, dev)
+ if (ipv6_chk_addr(&init_net, addr, dev, 1))
+ return dev;
+ return NULL;
+}
+
int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
{
struct net_device *dev;
@@ -128,12 +137,13 @@ int rdma_translate_ip(struct sockaddr *addr, struct
rdma_dev_addr *dev_addr)
dev_put(dev);
break;
case AF_INET6:
- for_each_netdev(&init_net, dev) {
- if (ipv6_chk_addr(&init_net, &((struct sockaddr_in6 *)
addr)->sin6_addr, dev, 1)) {
- ret = rdma_copy_addr(dev_addr, dev, NULL);
- break;
- }
- }
+ dev = cma_ipv6_dev_find(
+ &((struct sockaddr_in6 *)addr)->sin6_addr);
+
+ if (!dev)
+ return -EADDRNOTAVAIL;
+
+ ret = rdma_copy_addr(dev_addr, dev, NULL);
break;
default:
break;
@@ -279,30 +289,60 @@ 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);
- } else {
- ret = rdma_translate_ip(src_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;
- dev_put(dev);
- return ret;
+ 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);
+ return ret;
+ } else if (dst_in->sa_family == AF_INET6) {
+ struct in6_addr *a = &((struct sockaddr_in6
*)dst_in)->sin6_addr;
+
+ dev = cma_ipv6_dev_find(a);
+
+ 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);
+ }
+
+ return ret;
+ }
+ return -EADDRNOTAVAIL;
}
int rdma_resolve_ip(struct rdma_addr_client *client,
--
1.5.6.dirty
_______________________________________________
general mailing list
[email protected]
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
