diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-17 18:48:51 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-17 18:48:51 -0800 |
commit | 11af4409245096cef96a41327ed970f8789e1c1c (patch) | |
tree | 80621c6623aa54dceafc5743c8a016b609d7dc46 /crypto/scatterwalk.c | |
parent | baefc38c7ec56afcfa92594930b747a050c599b7 (diff) | |
parent | 9ece59e8fd3d017e04382709a4d48e81e00246fb (diff) | |
download | linux-crypto-11af4409245096cef96a41327ed970f8789e1c1c.tar.gz linux-crypto-11af4409245096cef96a41327ed970f8789e1c1c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'crypto/scatterwalk.c')
-rw-r--r-- | crypto/scatterwalk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c index 79ca2278..3bd749c7 100644 --- a/crypto/scatterwalk.c +++ b/crypto/scatterwalk.c @@ -62,7 +62,7 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out, walk->offset += PAGE_SIZE - 1; walk->offset &= PAGE_MASK; if (walk->offset >= walk->sg->offset + walk->sg->length) - scatterwalk_start(walk, scatterwalk_sg_next(walk->sg)); + scatterwalk_start(walk, sg_next(walk->sg)); } } @@ -116,7 +116,7 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg, break; offset += sg->length; - sg = scatterwalk_sg_next(sg); + sg = sg_next(sg); } scatterwalk_advance(&walk, start - offset); @@ -136,7 +136,7 @@ int scatterwalk_bytes_sglen(struct scatterlist *sg, int num_bytes) do { offset += sg->length; n++; - sg = scatterwalk_sg_next(sg); + sg = sg_next(sg); /* num_bytes is too large */ if (unlikely(!sg && (num_bytes < offset))) |