infiniband: Convert dst_fetch_ha() over to dst_neigh_lookup().
Now we must provide the IP destination address, and a reference has to be dropped when we're done with the entry. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9b28ecd66b
commit
02b619555a
|
@ -178,22 +178,26 @@ static void queue_req(struct addr_req *req)
|
|||
mutex_unlock(&lock);
|
||||
}
|
||||
|
||||
static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *addr)
|
||||
static int dst_fetch_ha(struct dst_entry *dst, struct rdma_dev_addr *dev_addr, void *daddr)
|
||||
{
|
||||
struct neighbour *n;
|
||||
int ret;
|
||||
|
||||
n = dst_neigh_lookup(dst, daddr);
|
||||
|
||||
rcu_read_lock();
|
||||
n = dst_get_neighbour_noref(dst);
|
||||
if (!n || !(n->nud_state & NUD_VALID)) {
|
||||
if (n)
|
||||
neigh_event_send(n, NULL);
|
||||
ret = -ENODATA;
|
||||
} else {
|
||||
ret = rdma_copy_addr(addr, dst->dev, n->ha);
|
||||
ret = rdma_copy_addr(dev_addr, dst->dev, n->ha);
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
if (n)
|
||||
neigh_release(n);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -232,7 +236,7 @@ static int addr4_resolve(struct sockaddr_in *src_in,
|
|||
goto put;
|
||||
}
|
||||
|
||||
ret = dst_fetch_ha(&rt->dst, addr);
|
||||
ret = dst_fetch_ha(&rt->dst, addr, &fl4.daddr);
|
||||
put:
|
||||
ip_rt_put(rt);
|
||||
out:
|
||||
|
@ -280,7 +284,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
|
|||
goto put;
|
||||
}
|
||||
|
||||
ret = dst_fetch_ha(dst, addr);
|
||||
ret = dst_fetch_ha(dst, addr, &fl6.daddr);
|
||||
put:
|
||||
dst_release(dst);
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue