diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:35:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:35:18 -0500 |
| commit | 52479b623d3d41df84c499325b6a8c7915413032 (patch) | |
| tree | 196f303f296b53dc89a05954d9c03226a9b4158b /include/net/dst.h | |
| parent | cdcbca7c1f1946758cfacb69bc1c7eeaccb11e2d (diff) | |
netns xfrm: lookup in netns
Pass netns to xfrm_lookup()/__xfrm_lookup(). For that pass netns
to flow_cache_lookup() and resolver callback.
Take it from socket or netdevice. Stub DECnet to init_net.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 6c778799bf10..6be3b082a070 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -291,21 +291,21 @@ enum { | |||
| 291 | 291 | ||
| 292 | struct flowi; | 292 | struct flowi; |
| 293 | #ifndef CONFIG_XFRM | 293 | #ifndef CONFIG_XFRM |
| 294 | static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl, | 294 | static inline int xfrm_lookup(struct net *net, struct dst_entry **dst_p, |
| 295 | struct sock *sk, int flags) | 295 | struct flowi *fl, struct sock *sk, int flags) |
| 296 | { | 296 | { |
| 297 | return 0; | 297 | return 0; |
| 298 | } | 298 | } |
| 299 | static inline int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl, | 299 | static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, |
| 300 | struct sock *sk, int flags) | 300 | struct flowi *fl, struct sock *sk, int flags) |
| 301 | { | 301 | { |
| 302 | return 0; | 302 | return 0; |
| 303 | } | 303 | } |
| 304 | #else | 304 | #else |
| 305 | extern int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl, | 305 | extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p, |
| 306 | struct sock *sk, int flags); | 306 | struct flowi *fl, struct sock *sk, int flags); |
| 307 | extern int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl, | 307 | extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, |
| 308 | struct sock *sk, int flags); | 308 | struct flowi *fl, struct sock *sk, int flags); |
| 309 | #endif | 309 | #endif |
| 310 | #endif | 310 | #endif |
| 311 | 311 | ||