diff options
Diffstat (limited to 'include/net/neighbour.h')
-rw-r--r-- | include/net/neighbour.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 365b5e260239..d8d790e56d3d 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -220,11 +220,7 @@ extern void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *p | |||
220 | static inline | 220 | static inline |
221 | struct net *neigh_parms_net(const struct neigh_parms *parms) | 221 | struct net *neigh_parms_net(const struct neigh_parms *parms) |
222 | { | 222 | { |
223 | #ifdef CONFIG_NET_NS | 223 | return read_pnet(&parms->net); |
224 | return parms->net; | ||
225 | #else | ||
226 | return &init_net; | ||
227 | #endif | ||
228 | } | 224 | } |
229 | 225 | ||
230 | extern unsigned long neigh_rand_reach_time(unsigned long base); | 226 | extern unsigned long neigh_rand_reach_time(unsigned long base); |
@@ -241,11 +237,7 @@ extern int pneigh_delete(struct neigh_table *tbl, struct net *net, const void | |||
241 | static inline | 237 | static inline |
242 | struct net *pneigh_net(const struct pneigh_entry *pneigh) | 238 | struct net *pneigh_net(const struct pneigh_entry *pneigh) |
243 | { | 239 | { |
244 | #ifdef CONFIG_NET_NS | 240 | return read_pnet(&pneigh->net); |
245 | return pneigh->net; | ||
246 | #else | ||
247 | return &init_net; | ||
248 | #endif | ||
249 | } | 241 | } |
250 | 242 | ||
251 | extern void neigh_app_ns(struct neighbour *n); | 243 | extern void neigh_app_ns(struct neighbour *n); |