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

[linux-2.6-block.git] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 95edcbedf6ef28a000503c389361796c68f6bd47..2bdbcec781cdb7abf44138092d9119aee7dabcec 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1377,13 +1377,13 @@ static int pfkey_getspi(struct sock *sk, struct sk_buff *skb, const struct sadb_
                max_spi = range->sadb_spirange_max;
        }
 
-       err = verify_spi_info(x->id.proto, min_spi, max_spi);
+       err = verify_spi_info(x->id.proto, min_spi, max_spi, NULL);
        if (err) {
                xfrm_state_put(x);
                return err;
        }
 
-       err = xfrm_alloc_spi(x, min_spi, max_spi);
+       err = xfrm_alloc_spi(x, min_spi, max_spi, NULL);
        resp_skb = err ? ERR_PTR(err) : pfkey_xfrm_state2msg(x);
 
        if (IS_ERR(resp_skb)) {
@@ -2626,7 +2626,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, NULL, 0);
+                           kma ? &k : NULL, net, NULL, 0, NULL);
 
  out:
        return err;