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 /net/decnet/dn_route.c | |
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 'net/decnet/dn_route.c')
-rw-r--r-- | net/decnet/dn_route.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 94f4ec036669..f31ce72dca65 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c | |||
@@ -244,7 +244,7 @@ static int dn_dst_gc(struct dst_ops *ops) | |||
244 | */ | 244 | */ |
245 | static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu) | 245 | static void dn_dst_update_pmtu(struct dst_entry *dst, u32 mtu) |
246 | { | 246 | { |
247 | struct neighbour *n = dst_get_neighbour(dst); | 247 | struct neighbour *n = dst_get_neighbour_noref(dst); |
248 | u32 min_mtu = 230; | 248 | u32 min_mtu = 230; |
249 | struct dn_dev *dn; | 249 | struct dn_dev *dn; |
250 | 250 | ||
@@ -713,7 +713,7 @@ out: | |||
713 | static int dn_to_neigh_output(struct sk_buff *skb) | 713 | static int dn_to_neigh_output(struct sk_buff *skb) |
714 | { | 714 | { |
715 | struct dst_entry *dst = skb_dst(skb); | 715 | struct dst_entry *dst = skb_dst(skb); |
716 | struct neighbour *n = dst_get_neighbour(dst); | 716 | struct neighbour *n = dst_get_neighbour_noref(dst); |
717 | 717 | ||
718 | return n->output(n, skb); | 718 | return n->output(n, skb); |
719 | } | 719 | } |
@@ -728,7 +728,7 @@ static int dn_output(struct sk_buff *skb) | |||
728 | 728 | ||
729 | int err = -EINVAL; | 729 | int err = -EINVAL; |
730 | 730 | ||
731 | if ((neigh = dst_get_neighbour(dst)) == NULL) | 731 | if ((neigh = dst_get_neighbour_noref(dst)) == NULL) |
732 | goto error; | 732 | goto error; |
733 | 733 | ||
734 | skb->dev = dev; | 734 | skb->dev = dev; |
@@ -852,7 +852,7 @@ static int dn_rt_set_next_hop(struct dn_route *rt, struct dn_fib_res *res) | |||
852 | } | 852 | } |
853 | rt->rt_type = res->type; | 853 | rt->rt_type = res->type; |
854 | 854 | ||
855 | if (dev != NULL && dst_get_neighbour(&rt->dst) == NULL) { | 855 | if (dev != NULL && dst_get_neighbour_noref(&rt->dst) == NULL) { |
856 | n = __neigh_lookup_errno(&dn_neigh_table, &rt->rt_gateway, dev); | 856 | n = __neigh_lookup_errno(&dn_neigh_table, &rt->rt_gateway, dev); |
857 | if (IS_ERR(n)) | 857 | if (IS_ERR(n)) |
858 | return PTR_ERR(n); | 858 | return PTR_ERR(n); |