Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2017-06-23

1) Use memdup_user to spmlify xfrm_user_policy.
   From Geliang Tang.

2) Make xfrm_dev_register static to silence a sparse warning.
   From Wei Yongjun.

3) Use crypto_memneq to check the ICV in the AH protocol.
   From Sabrina Dubroca.

4) Remove some unused variables in esp6.
   From Stephen Hemminger.

5) Extend XFRM MIGRATE to allow to change the UDP encapsulation port.
   From Antony Antony.

6) Include the UDP encapsulation port to km_migrate announcements.
   From Antony Antony.

Please pull or let me know if there are problems.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

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,
         }
 
         return xfrm_migrate(&sel, dir, XFRM_POLICY_TYPE_MAIN, m, i,
-                            kma ? &k : NULL, net);
+                            kma ? &k : NULL, net, NULL);
 
  out:
         return err;
@@ -3488,7 +3488,8 @@ static int set_ipsecrequest(struct sk_buff *skb,
 #ifdef CONFIG_NET_KEY_MIGRATE
 static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
                               const struct xfrm_migrate *m, int num_bundles,
-                              const struct xfrm_kmaddress *k)
+                              const struct xfrm_kmaddress *k,
+                              const struct xfrm_encap_tmpl *encap)
 {
         int i;
         int sasize_sel;
@@ -3598,7 +3599,8 @@ err:
 #else
 static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
                               const struct xfrm_migrate *m, int num_bundles,
-                              const struct xfrm_kmaddress *k)
+                              const struct xfrm_kmaddress *k,
+                              const struct xfrm_encap_tmpl *encap)
 {
         return -ENOPROTOOPT;
 }