diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:31:51 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:31:51 -0500 |
commit | 5447c5e401c49aba0c36bb1066f2d25b152553b7 (patch) | |
tree | 5a5b4e0736368a70a266bd04075d174310aa5f80 /net/xfrm/xfrm_user.c | |
parent | 12604d8aaa38ac4e24299c9803fefdb301a16421 (diff) |
netns xfrm: finding states in netns
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_user.c')
-rw-r--r-- | net/xfrm/xfrm_user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index e02ef3361190..3d577440b673 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c | |||
@@ -837,7 +837,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
837 | 837 | ||
838 | x = NULL; | 838 | x = NULL; |
839 | if (p->info.seq) { | 839 | if (p->info.seq) { |
840 | x = xfrm_find_acq_byseq(p->info.seq); | 840 | x = xfrm_find_acq_byseq(&init_net, p->info.seq); |
841 | if (x && xfrm_addr_cmp(&x->id.daddr, daddr, family)) { | 841 | if (x && xfrm_addr_cmp(&x->id.daddr, daddr, family)) { |
842 | xfrm_state_put(x); | 842 | xfrm_state_put(x); |
843 | x = NULL; | 843 | x = NULL; |
@@ -845,7 +845,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
845 | } | 845 | } |
846 | 846 | ||
847 | if (!x) | 847 | if (!x) |
848 | x = xfrm_find_acq(p->info.mode, p->info.reqid, | 848 | x = xfrm_find_acq(&init_net, p->info.mode, p->info.reqid, |
849 | p->info.id.proto, daddr, | 849 | p->info.id.proto, daddr, |
850 | &p->info.saddr, 1, | 850 | &p->info.saddr, 1, |
851 | family); | 851 | family); |