Skip to content

Commit f2fbb90

Browse files
sfrothwellkuba-moo
authored andcommitted
net: tcp: remove call to obsolete crypto_ahash_alignmask()
linux-next hit the following build error: net/ipv4/tcp_ao.c: In function 'tcp_ao_key_alloc': net/ipv4/tcp_ao.c:1536:13: error: implicit declaration of function 'crypto_ahash_alignmask'; did you mean 'crypto_ahash_alg_name'? [-Werror=implicit-function-declaration] 1536 | if (crypto_ahash_alignmask(tfm) > TCP_AO_KEY_ALIGN) { | ^~~~~~~~~~~~~~~~~~~~~~ | crypto_ahash_alg_name Caused by commit from the crypto tree 0f8660c ("crypto: ahash - remove crypto_ahash_alignmask") interacting with commit 4954f17 ("net/tcp: Introduce TCP_AO setsockopt()s") from networking. crypto_ahash_alignmask() has been phased out by the former commit, drop the call in networking. Eric confirms that the check is safe to remove and was questionable here in the first place. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Reviewed-by: Dmitry Safonov <dima@arista.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent e0f9f0e commit f2fbb90

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

net/ipv4/tcp_ao.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,10 +1533,6 @@ static struct tcp_ao_key *tcp_ao_key_alloc(struct sock *sk,
15331533
goto err_free_pool;
15341534

15351535
tfm = crypto_ahash_reqtfm(hp.req);
1536-
if (crypto_ahash_alignmask(tfm) > TCP_AO_KEY_ALIGN) {
1537-
err = -EOPNOTSUPP;
1538-
goto err_pool_end;
1539-
}
15401536
digest_size = crypto_ahash_digestsize(tfm);
15411537
tcp_sigpool_end(&hp);
15421538

@@ -1551,8 +1547,6 @@ static struct tcp_ao_key *tcp_ao_key_alloc(struct sock *sk,
15511547
key->digest_size = digest_size;
15521548
return key;
15531549

1554-
err_pool_end:
1555-
tcp_sigpool_end(&hp);
15561550
err_free_pool:
15571551
tcp_sigpool_release(pool_id);
15581552
return ERR_PTR(err);

0 commit comments

Comments
 (0)