diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 12:35:57 (GMT) |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 12:35:57 (GMT) |
commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/infiniband/core/addr.c | |
parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
download | linux-fsl-qoriq-2ca1a615835d9f4990f42102ab1f2ef434e7e89c.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/infiniband/core/addr.c')
-rw-r--r-- | drivers/infiniband/core/addr.c | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index d98b05b..ce511d8 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c @@ -128,6 +128,8 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr) ret = rdma_copy_addr(dev_addr, dev, NULL); dev_put(dev); break; + +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) case AF_INET6: for_each_netdev(&init_net, dev) { if (ipv6_chk_addr(&init_net, @@ -138,8 +140,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr) } } break; - default: - break; +#endif } return ret; } @@ -179,10 +180,11 @@ static void addr_send_arp(struct sockaddr *dst_in) { struct rtable *rt; struct flowi fl; - struct dst_entry *dst; memset(&fl, 0, sizeof fl); - if (dst_in->sa_family == AF_INET) { + + switch (dst_in->sa_family) { + case AF_INET: fl.nl_u.ip4_u.daddr = ((struct sockaddr_in *) dst_in)->sin_addr.s_addr; @@ -191,8 +193,13 @@ static void addr_send_arp(struct sockaddr *dst_in) neigh_event_send(rt->u.dst.neighbour, NULL); ip_rt_put(rt); + break; + +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + case AF_INET6: + { + struct dst_entry *dst; - } else { fl.nl_u.ip6_u.daddr = ((struct sockaddr_in6 *) dst_in)->sin6_addr; @@ -202,6 +209,9 @@ static void addr_send_arp(struct sockaddr *dst_in) neigh_event_send(dst->neighbour, NULL); dst_release(dst); + break; + } +#endif } } @@ -254,6 +264,7 @@ out: return ret; } +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) static int addr6_resolve_remote(struct sockaddr_in6 *src_in, struct sockaddr_in6 *dst_in, struct rdma_dev_addr *addr) @@ -282,6 +293,14 @@ static int addr6_resolve_remote(struct sockaddr_in6 *src_in, dst_release(dst); return ret; } +#else +static int addr6_resolve_remote(struct sockaddr_in6 *src_in, + struct sockaddr_in6 *dst_in, + struct rdma_dev_addr *addr) +{ + return -EADDRNOTAVAIL; +} +#endif static int addr_resolve_remote(struct sockaddr *src_in, struct sockaddr *dst_in, @@ -340,7 +359,9 @@ static int addr_resolve_local(struct sockaddr *src_in, struct net_device *dev; int ret; - if (dst_in->sa_family == AF_INET) { + switch (dst_in->sa_family) { + case 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; @@ -362,7 +383,12 @@ static int addr_resolve_local(struct sockaddr *src_in, memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN); } dev_put(dev); - } else { + break; + } + +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + case AF_INET6: + { struct in6_addr *a; for_each_netdev(&init_net, dev) @@ -390,6 +416,13 @@ static int addr_resolve_local(struct sockaddr *src_in, if (!ret) memcpy(addr->dst_dev_addr, dev->dev_addr, MAX_ADDR_LEN); } + break; + } +#endif + + default: + ret = -EADDRNOTAVAIL; + break; } return ret; |