Skip to content

Commit

Permalink
crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedone
Browse files Browse the repository at this point in the history
The offset advance in scatterwalk_pagedone not only is unnecessary,
but it was also buggy when it was needed by scatterwalk_copychunks.
As the latter has long ago been fixed to call scatterwalk_advance
directly, we can remove this unnecessary offset adjustment.

Signed-off-by: Herbert Xu <[email protected]>
  • Loading branch information
herbertx committed Jul 18, 2016
1 parent 5f070e8 commit 28cf86f
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions crypto/scatterwalk.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,8 @@ static void scatterwalk_pagedone(struct scatter_walk *walk, int out,
flush_dcache_page(page);
}

if (more) {
walk->offset += PAGE_SIZE - 1;
walk->offset &= PAGE_MASK;
if (walk->offset >= walk->sg->offset + walk->sg->length)
scatterwalk_start(walk, sg_next(walk->sg));
}
if (more && walk->offset >= walk->sg->offset + walk->sg->length)
scatterwalk_start(walk, sg_next(walk->sg));
}

void scatterwalk_done(struct scatter_walk *walk, int out, int more)
Expand Down

0 comments on commit 28cf86f

Please sign in to comment.