aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-02 22:58:02 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-05 02:42:00 -0700
commit36bdbcae2fa2a6dfa99344d4190fcea0aa7b7c25 (patch)
tree79d4167b6913428522dc6e5a0bf98a9d58d36f9e /include
parentxfrm: No need to copy generic neighbour pointer. (diff)
downloadlinux-dev-36bdbcae2fa2a6dfa99344d4190fcea0aa7b7c25.tar.xz
linux-dev-36bdbcae2fa2a6dfa99344d4190fcea0aa7b7c25.zip
net: Kill dst->_neighbour, accessors, and final uses.
No longer used. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/dst.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 295a70547e7d..b2634e446613 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -42,7 +42,7 @@ struct dst_entry {
struct dst_entry *from;
};
struct dst_entry *path;
- struct neighbour __rcu *_neighbour;
+ void *__pad0;
#ifdef CONFIG_XFRM
struct xfrm_state *xfrm;
#else
@@ -96,21 +96,6 @@ struct dst_entry {
};
};
-static inline struct neighbour *dst_get_neighbour_noref(struct dst_entry *dst)
-{
- return rcu_dereference(dst->_neighbour);
-}
-
-static inline struct neighbour *dst_get_neighbour_noref_raw(struct dst_entry *dst)
-{
- return rcu_dereference_raw(dst->_neighbour);
-}
-
-static inline void dst_set_neighbour(struct dst_entry *dst, struct neighbour *neigh)
-{
- rcu_assign_pointer(dst->_neighbour, neigh);
-}
-
extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
extern const u32 dst_default_metrics[RTAX_MAX];