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 /net/core | |
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 'net/core')
-rw-r--r-- | net/core/flow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index d323388dd1ba..96015871ecea 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -165,7 +165,7 @@ static int flow_key_compare(struct flowi *key1, struct flowi *key2) | |||
165 | return 0; | 165 | return 0; |
166 | } | 166 | } |
167 | 167 | ||
168 | void *flow_cache_lookup(struct flowi *key, u16 family, u8 dir, | 168 | void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir, |
169 | flow_resolve_t resolver) | 169 | flow_resolve_t resolver) |
170 | { | 170 | { |
171 | struct flow_cache_entry *fle, **head; | 171 | struct flow_cache_entry *fle, **head; |
@@ -225,7 +225,7 @@ nocache: | |||
225 | void *obj; | 225 | void *obj; |
226 | atomic_t *obj_ref; | 226 | atomic_t *obj_ref; |
227 | 227 | ||
228 | err = resolver(key, family, dir, &obj, &obj_ref); | 228 | err = resolver(net, key, family, dir, &obj, &obj_ref); |
229 | 229 | ||
230 | if (fle && !err) { | 230 | if (fle && !err) { |
231 | fle->genid = atomic_read(&flow_cache_genid); | 231 | fle->genid = atomic_read(&flow_cache_genid); |