diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-03 01:58:02 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-05 05:42:00 -0400 |
commit | 36bdbcae2fa2a6dfa99344d4190fcea0aa7b7c25 (patch) | |
tree | 79d4167b6913428522dc6e5a0bf98a9d58d36f9e /include | |
parent | d1e31fb02b31ba88d5650d97c35eb58f52bfe0e1 (diff) |
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.h | 17 |
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 { | |||
42 | struct dst_entry *from; | 42 | struct dst_entry *from; |
43 | }; | 43 | }; |
44 | struct dst_entry *path; | 44 | struct dst_entry *path; |
45 | struct neighbour __rcu *_neighbour; | 45 | void *__pad0; |
46 | #ifdef CONFIG_XFRM | 46 | #ifdef CONFIG_XFRM |
47 | struct xfrm_state *xfrm; | 47 | struct xfrm_state *xfrm; |
48 | #else | 48 | #else |
@@ -96,21 +96,6 @@ struct dst_entry { | |||
96 | }; | 96 | }; |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static inline struct neighbour *dst_get_neighbour_noref(struct dst_entry *dst) | ||
100 | { | ||
101 | return rcu_dereference(dst->_neighbour); | ||
102 | } | ||
103 | |||
104 | static inline struct neighbour *dst_get_neighbour_noref_raw(struct dst_entry *dst) | ||
105 | { | ||
106 | return rcu_dereference_raw(dst->_neighbour); | ||
107 | } | ||
108 | |||
109 | static inline void dst_set_neighbour(struct dst_entry *dst, struct neighbour *neigh) | ||
110 | { | ||
111 | rcu_assign_pointer(dst->_neighbour, neigh); | ||
112 | } | ||
113 | |||
114 | extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old); | 99 | extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old); |
115 | extern const u32 dst_default_metrics[RTAX_MAX]; | 100 | extern const u32 dst_default_metrics[RTAX_MAX]; |
116 | 101 | ||