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/ipv6/ndisc.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/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index cfb9709ac7c9..e72c8af85781 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -1238,7 +1238,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) | |||
1238 | rt = rt6_get_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev); | 1238 | rt = rt6_get_dflt_router(&ipv6_hdr(skb)->saddr, skb->dev); |
1239 | 1239 | ||
1240 | if (rt) | 1240 | if (rt) |
1241 | neigh = dst_get_neighbour(&rt->dst); | 1241 | neigh = dst_get_neighbour_noref(&rt->dst); |
1242 | 1242 | ||
1243 | if (rt && lifetime == 0) { | 1243 | if (rt && lifetime == 0) { |
1244 | neigh_clone(neigh); | 1244 | neigh_clone(neigh); |
@@ -1258,7 +1258,7 @@ static void ndisc_router_discovery(struct sk_buff *skb) | |||
1258 | return; | 1258 | return; |
1259 | } | 1259 | } |
1260 | 1260 | ||
1261 | neigh = dst_get_neighbour(&rt->dst); | 1261 | neigh = dst_get_neighbour_noref(&rt->dst); |
1262 | if (neigh == NULL) { | 1262 | if (neigh == NULL) { |
1263 | ND_PRINTK0(KERN_ERR | 1263 | ND_PRINTK0(KERN_ERR |
1264 | "ICMPv6 RA: %s() got default router without neighbour.\n", | 1264 | "ICMPv6 RA: %s() got default router without neighbour.\n", |