From: Andrew Morton Signed-off-by: Andrew Morton --- include/net/esp.h | 2 +- net/ipv4/esp4.c | 2 +- net/ipv6/esp6.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN include/net/esp.h~git-cryptodev-fixup-2 include/net/esp.h --- a/include/net/esp.h~git-cryptodev-fixup-2 +++ a/include/net/esp.h @@ -23,7 +23,7 @@ struct esp_data int ivlen; int ivinitted; u8 *ivec; /* ivec buffer */ - struct crypto_tfm *tfm; /* crypto handle */ + struct crypto_blkcipher *tfm; /* crypto handle */ } conf; /* Integrity. It is active when icv_full_len != 0 */ diff -puN net/ipv4/esp4.c~git-cryptodev-fixup-2 net/ipv4/esp4.c --- a/net/ipv4/esp4.c~git-cryptodev-fixup-2 +++ a/net/ipv4/esp4.c @@ -100,7 +100,7 @@ static int esp_output(struct xfrm_state get_random_bytes(esp->conf.ivec, esp->conf.ivlen); esp->conf.ivinitted = 1; } - crypto_cipher_set_iv(tfm, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm)); + crypto_blkcipher_set_iv(tfm, esp->conf.ivec, esp->conf.ivlen); } do { struct scatterlist *sg = &esp->sgbuf[0]; diff -puN net/ipv6/esp6.c~git-cryptodev-fixup-2 net/ipv6/esp6.c --- a/net/ipv6/esp6.c~git-cryptodev-fixup-2 +++ a/net/ipv6/esp6.c @@ -104,7 +104,7 @@ static int esp6_output(struct xfrm_state get_random_bytes(esp->conf.ivec, esp->conf.ivlen); esp->conf.ivinitted = 1; } - crypto_cipher_set_iv(tfm, esp->conf.ivec, crypto_tfm_alg_ivsize(tfm)); + crypto_blkcipher_set_iv(tfm, esp->conf.ivec, esp->conf.ivlen); } do { _