diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:15:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:15:16 -0500 |
commit | 673c09be457bb23aa0eaaa79804cbb342210d195 (patch) | |
tree | 9948d1859bbcd07316f5cea239b86845d6061570 /net/key | |
parent | d62ddc21b674b5ac1466091ff3fbf7baa53bc92c (diff) |
netns xfrm: add struct xfrm_state::xs_net
To avoid unnecessary complications with passing netns around.
* set once, very early after allocating
* once set, never changes
For a while create every xfrm_state in init_net.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 5b22e011653b..bde8aad4cc93 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -1122,7 +1122,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct sadb_msg *hdr, | |||
1122 | (key->sadb_key_bits+7) / 8 > key->sadb_key_len * sizeof(uint64_t))) | 1122 | (key->sadb_key_bits+7) / 8 > key->sadb_key_len * sizeof(uint64_t))) |
1123 | return ERR_PTR(-EINVAL); | 1123 | return ERR_PTR(-EINVAL); |
1124 | 1124 | ||
1125 | x = xfrm_state_alloc(); | 1125 | x = xfrm_state_alloc(&init_net); |
1126 | if (x == NULL) | 1126 | if (x == NULL) |
1127 | return ERR_PTR(-ENOBUFS); | 1127 | return ERR_PTR(-ENOBUFS); |
1128 | 1128 | ||