diff options
| author | Doug Ledford <dledford@redhat.com> | 2015-09-25 10:46:07 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-09-25 10:46:07 -0400 |
| commit | a99c59c0accea388f83ea651e90c814aeac04785 (patch) | |
| tree | 1d102927807aa7c12a8a66cbb59d6560c6520645 /crypto/algif_skcipher.c | |
| parent | c16e43ca0904ac1f8c20a2c007801d4d69bdb6f7 (diff) | |
| parent | 733601f243cfd24755f2c120fb9f9ec284fa5ca1 (diff) | |
| download | linux-crypto-a99c59c0accea388f83ea651e90c814aeac04785.tar.gz linux-crypto-a99c59c0accea388f83ea651e90c814aeac04785.zip | |
Merge tag 'v4.3-rc2' into k.o/for-4.3-v1
Linux 4.3-rc2
Diffstat (limited to '')
| -rw-r--r-- | crypto/algif_skcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 94507529..af31a0ee 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -145,7 +145,7 @@ static int skcipher_alloc_sgl(struct sock *sk) sgl->cur = 0; if (sg) - scatterwalk_sg_chain(sg, MAX_SGL_ENTS + 1, sgl->sg); + sg_chain(sg, MAX_SGL_ENTS + 1, sgl->sg); list_add_tail(&sgl->list, &ctx->tsgl); } |