diff options
author | David Miller <davem@davemloft.net> | 2011-12-02 11:52:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-05 15:20:19 -0500 |
commit | 2721745501a26d0dc3b88c0d2f3aa11471891388 (patch) | |
tree | e9c09622b11ad7d9317b4b01824374a852867c28 /drivers/infiniband/core | |
parent | 761965eab38d2cbc59c36e355c59609e3a04705a (diff) |
net: Rename dst_get_neighbour{, _raw} to dst_get_neighbour_noref{, _raw}.
To reflect the fact that a refrence is not obtained to the
resulting neighbour entry.
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/core')
-rw-r--r-- | drivers/infiniband/core/addr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index a20c3c8224ea..70154f7e0415 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c | |||
@@ -217,7 +217,7 @@ static int addr4_resolve(struct sockaddr_in *src_in, | |||
217 | neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->dst.dev); | 217 | neigh = neigh_lookup(&arp_tbl, &rt->rt_gateway, rt->dst.dev); |
218 | if (!neigh || !(neigh->nud_state & NUD_VALID)) { | 218 | if (!neigh || !(neigh->nud_state & NUD_VALID)) { |
219 | rcu_read_lock(); | 219 | rcu_read_lock(); |
220 | neigh_event_send(dst_get_neighbour(&rt->dst), NULL); | 220 | neigh_event_send(dst_get_neighbour_noref(&rt->dst), NULL); |
221 | rcu_read_unlock(); | 221 | rcu_read_unlock(); |
222 | ret = -ENODATA; | 222 | ret = -ENODATA; |
223 | if (neigh) | 223 | if (neigh) |
@@ -277,7 +277,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in, | |||
277 | } | 277 | } |
278 | 278 | ||
279 | rcu_read_lock(); | 279 | rcu_read_lock(); |
280 | neigh = dst_get_neighbour(dst); | 280 | neigh = dst_get_neighbour_noref(dst); |
281 | if (!neigh || !(neigh->nud_state & NUD_VALID)) { | 281 | if (!neigh || !(neigh->nud_state & NUD_VALID)) { |
282 | if (neigh) | 282 | if (neigh) |
283 | neigh_event_send(neigh, NULL); | 283 | neigh_event_send(neigh, NULL); |