From nobody Fri Apr 29 23:12:28 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 65E5B1ABCA64; Fri, 29 Apr 2022 23:12:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KqpDD6QgWz3w5F; Fri, 29 Apr 2022 23:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7hu48RcQLwYKKLkGApVCF7Xyamlo/5OVhRYKA055ZE=; b=uQnAz+H67iOhZyS0K+6+Vspew2LYgOG3FDqne68Ghqs6lF6NDA9gpR22zJNmgXbXCcTEL3 HnJlsYLkbgK3HQDgq04uBmLY9C4/gFgsPSmocYJQs1QzTW9p/qymuYmCfd0edvsBKoaiCx /wfIPZVBrIJO237oWEjpmG4RN+fLeFEyAcLb0We+2VGtM5x/yuUjrdjkj2vJIXZuNy+GjA 64shW0mYvi91BWDbnC4Rob4jjIy8wfnntraQw4FXT7RwPDSTTynKchSSpQ3YAauhpb2G7j E14XqCjvwJyJMgOjofzKg07C3ycB4kfS9KFc8PQnj+s80YmroReZDfHoz8P62Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6BF3316300; Fri, 29 Apr 2022 23:12:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23TNCSjn044697; Fri, 29 Apr 2022 23:12:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TNCSEC044696; Fri, 29 Apr 2022 23:12:28 GMT (envelope-from git) Date: Fri, 29 Apr 2022 23:12:28 GMT Message-Id: <202204292312.23TNCSEC044696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 831ee0f47140 - stable/13 - cryptodev.h: Drop 'extern' from function prototypes. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 831ee0f471401458b5284aefc4e5f719286cb0bb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651273949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M7hu48RcQLwYKKLkGApVCF7Xyamlo/5OVhRYKA055ZE=; b=dXKimvtmwLRX+V1J9h8Cmp3BvLbh3afa7STx3Wglp9h6+A2xsduoU9g3uR4fddvFPmem7D Ll7mHP1NWzzJvrgrPGBje0qxSev9YUFr6TYdQndLb9reRjPDr9Hv8G66EK4W6gAiz1AOHQ 7cNTJGCEKvju4rc8q7H3J7u0b5CwwRsfHiOBnxEfvdvkzN6QOo8k7Ioehdcupm71Rra0Uc G0iejihPKfOPwLPi5pB5sDK3OT8eP6WOw4ku5r+tsCt5puZFLNkOh6N0otNMqV+/l4YhRi es86/enEykEJrh4evyko00/AGcZlL+290MiN3ers8IhdIOq1lCSzkc01s1HDQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651273949; a=rsa-sha256; cv=none; b=rrW9pfZgikD41d3/wdWJLqQ92lDf7Al8cJ/hV8xva0pIpzrNRK9JtTC0ylyWuqVwHJxa4P fo/Cq0mAnZUMUMRA1h4remJ1d1uA9Irgt6JgscfccsOye0JuH8k2LFvggEj4P0ljYvu/dG PXkjSaOwp5YcJsNFampGgeEWBt+NfFsAExny+f1HZPo1GZHHQmXT87faU9wLvbBcK7spWU q30ORzx0+Uhx9aXXZNezJEptEMfjjVFiqWIJhS5Xp+uHHF/iAmMMtwR9YTig3NgrpHcjWb r5KBrfZRjfzulC5sea8TI5pZnKsrs7MxmjEaRmfhp3CG+t6L6tN6zLicODezHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=831ee0f471401458b5284aefc4e5f719286cb0bb commit 831ee0f471401458b5284aefc4e5f719286cb0bb Author: John Baldwin AuthorDate: 2021-12-20 22:43:14 +0000 Commit: John Baldwin CommitDate: 2022-04-29 22:41:11 +0000 cryptodev.h: Drop 'extern' from function prototypes. Sponsored by: Chelsio Communications (cherry picked from commit d074adf18be2801d2c19bf50677ff10495348fc5) --- sys/opencrypto/cryptodev.h | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/opencrypto/cryptodev.h b/sys/opencrypto/cryptodev.h index db17e8d2d3b7..8aa9f80ec696 100644 --- a/sys/opencrypto/cryptodev.h +++ b/sys/opencrypto/cryptodev.h @@ -656,7 +656,7 @@ struct cryptkop { uint32_t crypto_ses2hid(crypto_session_t crypto_session); uint32_t crypto_ses2caps(crypto_session_t crypto_session); -void *crypto_get_driver_session(crypto_session_t crypto_session); +void *crypto_get_driver_session(crypto_session_t crypto_session); const struct crypto_session_params *crypto_get_params( crypto_session_t crypto_session); struct auth_hash *crypto_auth_hash(const struct crypto_session_params *csp); @@ -664,33 +664,32 @@ struct enc_xform *crypto_cipher(const struct crypto_session_params *csp); MALLOC_DECLARE(M_CRYPTO_DATA); -extern int crypto_newsession(crypto_session_t *cses, - const struct crypto_session_params *params, int hard); -extern void crypto_freesession(crypto_session_t cses); +int crypto_newsession(crypto_session_t *cses, + const struct crypto_session_params *params, int crid); +void crypto_freesession(crypto_session_t cses); #define CRYPTOCAP_F_HARDWARE CRYPTO_FLAG_HARDWARE #define CRYPTOCAP_F_SOFTWARE CRYPTO_FLAG_SOFTWARE #define CRYPTOCAP_F_SYNC 0x04000000 /* operates synchronously */ #define CRYPTOCAP_F_ACCEL_SOFTWARE 0x08000000 -extern int32_t crypto_get_driverid(device_t dev, size_t session_size, - int flags); -extern int crypto_find_driver(const char *); -extern device_t crypto_find_device_byhid(int hid); -extern int crypto_getcaps(int hid); -extern int crypto_kregister(uint32_t, int, uint32_t); -extern int crypto_unregister_all(uint32_t driverid); -extern int crypto_dispatch(struct cryptop *crp); -extern int crypto_kdispatch(struct cryptkop *); +int32_t crypto_get_driverid(device_t dev, size_t session_size, int flags); +int crypto_find_driver(const char *); +device_t crypto_find_device_byhid(int hid); +int crypto_getcaps(int hid); +int crypto_kregister(uint32_t, int, uint32_t); +int crypto_unregister_all(uint32_t driverid); +int crypto_dispatch(struct cryptop *crp); +int crypto_kdispatch(struct cryptkop *); #define CRYPTO_SYMQ 0x1 #define CRYPTO_ASYMQ 0x2 -extern int crypto_unblock(uint32_t, int); -extern void crypto_done(struct cryptop *crp); -extern void crypto_kdone(struct cryptkop *); -extern int crypto_getfeat(int *); - -extern void crypto_destroyreq(struct cryptop *crp); -extern void crypto_initreq(struct cryptop *crp, crypto_session_t cses); -extern void crypto_freereq(struct cryptop *crp); -extern struct cryptop *crypto_getreq(crypto_session_t cses, int how); +int crypto_unblock(uint32_t, int); +void crypto_done(struct cryptop *crp); +void crypto_kdone(struct cryptkop *); +int crypto_getfeat(int *); + +void crypto_destroyreq(struct cryptop *crp); +void crypto_initreq(struct cryptop *crp, crypto_session_t cses); +void crypto_freereq(struct cryptop *crp); +struct cryptop *crypto_getreq(crypto_session_t cses, int how); extern int crypto_usercrypto; /* userland may do crypto requests */ extern int crypto_userasymcrypto; /* userland may do asym crypto reqs */