diff options
| author | David Miller <davem@davemloft.net> | 2011-12-02 16:52:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-05 15:20:19 -0500 |
| commit | 2721745501a26d0dc3b88c0d2f3aa11471891388 (patch) | |
| tree | e9c09622b11ad7d9317b4b01824374a852867c28 /net/core | |
| parent | 761965eab38d2cbc59c36e355c59609e3a04705a (diff) | |
| download | blackbird-op-linux-2721745501a26d0dc3b88c0d2f3aa11471891388.tar.gz blackbird-op-linux-2721745501a26d0dc3b88c0d2f3aa11471891388.zip | |
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/core')
| -rw-r--r-- | net/core/dst.c | 2 | ||||
| -rw-r--r-- | net/core/neighbour.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index d5e2c4c09107..43d94cedbf7c 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -366,7 +366,7 @@ static void dst_ifdown(struct dst_entry *dst, struct net_device *dev, dev_hold(dst->dev); dev_put(dev); rcu_read_lock(); - neigh = dst_get_neighbour(dst); + neigh = dst_get_neighbour_noref(dst); if (neigh && neigh->dev == dev) { neigh->dev = dst->dev; dev_hold(dst->dev); diff --git a/net/core/neighbour.c b/net/core/neighbour.c index cdf8dc34f0ba..4af151e1bf5d 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1190,7 +1190,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, rcu_read_lock(); /* On shaper/eql skb->dst->neighbour != neigh :( */ - if (dst && (n2 = dst_get_neighbour(dst)) != NULL) + if (dst && (n2 = dst_get_neighbour_noref(dst)) != NULL) n1 = n2; n1->output(n1, skb); rcu_read_unlock(); |
