|
@@ -128,7 +128,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr,
|
|
|
int ret = -EADDRNOTAVAIL;
|
|
|
|
|
|
if (dev_addr->bound_dev_if) {
|
|
|
- dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
|
|
|
+ dev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);
|
|
|
if (!dev)
|
|
|
return -ENODEV;
|
|
|
ret = rdma_copy_addr(dev_addr, dev, NULL);
|
|
@@ -138,7 +138,7 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr,
|
|
|
|
|
|
switch (addr->sa_family) {
|
|
|
case AF_INET:
|
|
|
- dev = ip_dev_find(&init_net,
|
|
|
+ dev = ip_dev_find(dev_addr->net,
|
|
|
((struct sockaddr_in *) addr)->sin_addr.s_addr);
|
|
|
|
|
|
if (!dev)
|
|
@@ -149,12 +149,11 @@ int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr,
|
|
|
*vlan_id = rdma_vlan_dev_vlan_id(dev);
|
|
|
dev_put(dev);
|
|
|
break;
|
|
|
-
|
|
|
#if IS_ENABLED(CONFIG_IPV6)
|
|
|
case AF_INET6:
|
|
|
rcu_read_lock();
|
|
|
- for_each_netdev_rcu(&init_net, dev) {
|
|
|
- if (ipv6_chk_addr(&init_net,
|
|
|
+ for_each_netdev_rcu(dev_addr->net, dev) {
|
|
|
+ if (ipv6_chk_addr(dev_addr->net,
|
|
|
&((struct sockaddr_in6 *) addr)->sin6_addr,
|
|
|
dev, 1)) {
|
|
|
ret = rdma_copy_addr(dev_addr, dev, NULL);
|
|
@@ -236,7 +235,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,
|
|
|
fl4.daddr = dst_ip;
|
|
|
fl4.saddr = src_ip;
|
|
|
fl4.flowi4_oif = addr->bound_dev_if;
|
|
|
- rt = ip_route_output_key(&init_net, &fl4);
|
|
|
+ rt = ip_route_output_key(addr->net, &fl4);
|
|
|
if (IS_ERR(rt)) {
|
|
|
ret = PTR_ERR(rt);
|
|
|
goto out;
|
|
@@ -278,12 +277,12 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
|
|
|
fl6.saddr = src_in->sin6_addr;
|
|
|
fl6.flowi6_oif = addr->bound_dev_if;
|
|
|
|
|
|
- dst = ip6_route_output(&init_net, NULL, &fl6);
|
|
|
+ dst = ip6_route_output(addr->net, NULL, &fl6);
|
|
|
if ((ret = dst->error))
|
|
|
goto put;
|
|
|
|
|
|
if (ipv6_addr_any(&fl6.saddr)) {
|
|
|
- ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev,
|
|
|
+ ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,
|
|
|
&fl6.daddr, 0, &fl6.saddr);
|
|
|
if (ret)
|
|
|
goto put;
|
|
@@ -477,6 +476,7 @@ int rdma_addr_find_dmac_by_grh(const union ib_gid *sgid, const union ib_gid *dgi
|
|
|
|
|
|
memset(&dev_addr, 0, sizeof(dev_addr));
|
|
|
dev_addr.bound_dev_if = if_index;
|
|
|
+ dev_addr.net = &init_net;
|
|
|
|
|
|
ctx.addr = &dev_addr;
|
|
|
init_completion(&ctx.comp);
|
|
@@ -511,6 +511,7 @@ int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id)
|
|
|
rdma_gid2ip(&gid_addr._sockaddr, sgid);
|
|
|
|
|
|
memset(&dev_addr, 0, sizeof(dev_addr));
|
|
|
+ dev_addr.net = &init_net;
|
|
|
ret = rdma_translate_ip(&gid_addr._sockaddr, &dev_addr, vlan_id);
|
|
|
if (ret)
|
|
|
return ret;
|