diff options
Diffstat (limited to 'net/key/af_key.c')
-rw-r--r-- | net/key/af_key.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index daa4e90dc4db..ce9b8565d825 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c | |||
@@ -2589,7 +2589,7 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb, | |||
2589 | } | 2589 | } |
2590 | 2590 | ||
2591 | return xfrm_migrate(&sel, dir, XFRM_POLICY_TYPE_MAIN, m, i, | 2591 | return xfrm_migrate(&sel, dir, XFRM_POLICY_TYPE_MAIN, m, i, |
2592 | kma ? &k : NULL, net); | 2592 | kma ? &k : NULL, net, NULL); |
2593 | 2593 | ||
2594 | out: | 2594 | out: |
2595 | return err; | 2595 | return err; |
@@ -3488,7 +3488,8 @@ static int set_ipsecrequest(struct sk_buff *skb, | |||
3488 | #ifdef CONFIG_NET_KEY_MIGRATE | 3488 | #ifdef CONFIG_NET_KEY_MIGRATE |
3489 | static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, | 3489 | static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, |
3490 | const struct xfrm_migrate *m, int num_bundles, | 3490 | const struct xfrm_migrate *m, int num_bundles, |
3491 | const struct xfrm_kmaddress *k) | 3491 | const struct xfrm_kmaddress *k, |
3492 | const struct xfrm_encap_tmpl *encap) | ||
3492 | { | 3493 | { |
3493 | int i; | 3494 | int i; |
3494 | int sasize_sel; | 3495 | int sasize_sel; |
@@ -3598,7 +3599,8 @@ err: | |||
3598 | #else | 3599 | #else |
3599 | static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, | 3600 | static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, |
3600 | const struct xfrm_migrate *m, int num_bundles, | 3601 | const struct xfrm_migrate *m, int num_bundles, |
3601 | const struct xfrm_kmaddress *k) | 3602 | const struct xfrm_kmaddress *k, |
3603 | const struct xfrm_encap_tmpl *encap) | ||
3602 | { | 3604 | { |
3603 | return -ENOPROTOOPT; | 3605 | return -ENOPROTOOPT; |
3604 | } | 3606 | } |