aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_output.c
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-12-02 11:52:08 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-05 15:20:19 -0500
commit2721745501a26d0dc3b88c0d2f3aa11471891388 (patch)
treee9c09622b11ad7d9317b4b01824374a852867c28 /net/ipv6/ip6_output.c
parent761965eab38d2cbc59c36e355c59609e3a04705a (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/ipv6/ip6_output.c')
-rw-r--r--net/ipv6/ip6_output.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 3221bc675654..71d26999c955 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -136,7 +136,7 @@ static int ip6_finish_output2(struct sk_buff *skb)
136 } 136 }
137 137
138 rcu_read_lock(); 138 rcu_read_lock();
139 neigh = dst_get_neighbour(dst); 139 neigh = dst_get_neighbour_noref(dst);
140 if (neigh) { 140 if (neigh) {
141 int res = neigh_output(neigh, skb); 141 int res = neigh_output(neigh, skb);
142 142
@@ -463,7 +463,7 @@ int ip6_forward(struct sk_buff *skb)
463 send redirects to source routed frames. 463 send redirects to source routed frames.
464 We don't send redirects to frames decapsulated from IPsec. 464 We don't send redirects to frames decapsulated from IPsec.
465 */ 465 */
466 n = dst_get_neighbour(dst); 466 n = dst_get_neighbour_noref(dst);
467 if (skb->dev == dst->dev && n && opt->srcrt == 0 && !skb_sec_path(skb)) { 467 if (skb->dev == dst->dev && n && opt->srcrt == 0 && !skb_sec_path(skb)) {
468 struct in6_addr *target = NULL; 468 struct in6_addr *target = NULL;
469 struct rt6_info *rt; 469 struct rt6_info *rt;
@@ -983,7 +983,7 @@ static int ip6_dst_lookup_tail(struct sock *sk,
983 * dst entry of the nexthop router 983 * dst entry of the nexthop router
984 */ 984 */
985 rcu_read_lock(); 985 rcu_read_lock();
986 n = dst_get_neighbour(*dst); 986 n = dst_get_neighbour_noref(*dst);
987 if (n && !(n->nud_state & NUD_VALID)) { 987 if (n && !(n->nud_state & NUD_VALID)) {
988 struct inet6_ifaddr *ifp; 988 struct inet6_ifaddr *ifp;
989 struct flowi6 fl_gw6; 989 struct flowi6 fl_gw6;