From nobody Wed Oct 19 22:18:39 2022 X-Original-To: dev-commits-src-main@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 4Mt4rH34jYz4ftTt; Wed, 19 Oct 2022 22:18:39 +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 4Mt4rH2VFfz3PWt; Wed, 19 Oct 2022 22:18:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666217919; 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=ANqe3nkbJNOwL5DwHGEXxJgh9gIpFtLYiCcgW7b8hKw=; b=rTXhVXEwzeLAXZcdJalZaikxhlXY53Afpe2Aix43lq8RKpOge9bu+J4pwPHzJjlzLwgjEJ Gn1sClDSDFvwgTzIerDVHD83k489qkUKemfMuYh4EIGAXc9wvr6rBJ8G60n1xEcnnEXcro qgMFqk6hOhBN4N4wrDJSF3nS3lxS7UYyr2mNmS1SLMmdkXe94XgzQD2c+Khhr5pN0WUoAt idtnUvwnSHD6d59ovibZ/t610LDlZwql0ZH30HPbuxOjXLO/SgT1ou05Lo8IrdsQlSf/y1 Fecr6RyufH4i6T++qQ4cbcS7yyJ3CjpYLFrpZlVOSMAGXB1/sRvxWh9vdgAJ7A== 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 4Mt4rH1X6bzgSn; Wed, 19 Oct 2022 22:18:39 +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 29JMIdek035760; Wed, 19 Oct 2022 22:18:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29JMIdwU035759; Wed, 19 Oct 2022 22:18:39 GMT (envelope-from git) Date: Wed, 19 Oct 2022 22:18:39 GMT Message-Id: <202210192218.29JMIdwU035759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e1401f75790f - main - cxgbe: use standard sototcpcb() accessor macro to get socket's tcpcb List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1401f75790f931bcdfc01734b1b37cfbb541a54 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666217919; 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=ANqe3nkbJNOwL5DwHGEXxJgh9gIpFtLYiCcgW7b8hKw=; b=dqcLvN6NHU5XGcuWBdtPbLgWl+nEJq98VNtxH96VimNcPvQQ4fRH1zJVWIFlb45lNj/3QN EA2o8aFlNBeduPVi1k9jPP1ZOjRPH27j7j0xlQ7hdaasj4DhnwaZEaoI68s07GowAlWXOf DbmHQ3JN361IeqQOkc6rOOpOD0bNU39FadzZtBEpBwJ9LWv0xt6Tupz7gDDxIKlKaTIwMj 9YugHkXX3YYDrS+xxdZEY0Q0dJgd6yZyLc64uDVQpmcLV13bc5zIM7a3qQq22T314CNneN jUzjAmg8MhjsAXfgHvcVOEkMZj1O53eFco1Qq1Pf2OtvHNf9RmtCefvRr6s44A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666217919; a=rsa-sha256; cv=none; b=Ynf1Pa2aAsRslIK0n+KE9aTOtAzkbLZiewlF/PAKCL0vUHHPUdTXDvDaZJFmQgwTN0rXkR iKMSB6DSS3C+/x/MHqhELUNYRuDkjUi+lkVa7kT9f8DEcjSBQfh92xEFLYJalU6KIzNfqi m5qMV5ENVFE5ygBNhnfdMNbHCh5vqPDaZ8A8lSqmwDajsRfiW/knq3+ljK4yvKphD5HFiQ 4+R5GIiGYg/sNaAU//Dx+VO3yRyEsU/N6Z7I6gZpaW2expm+XIB1ShKRa/aoiuL1VBBVDv F/yCCVGmc/5Lye9/bLoCqBV180VViVRhevcFEhqjV2U0IPLz3yAE8H1N3S9vzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e1401f75790f931bcdfc01734b1b37cfbb541a54 commit e1401f75790f931bcdfc01734b1b37cfbb541a54 Author: Gleb Smirnoff AuthorDate: 2022-10-19 22:15:32 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-19 22:15:32 +0000 cxgbe: use standard sototcpcb() accessor macro to get socket's tcpcb Reviewed by: np Differential revision: https://reviews.freebsd.org/D37041 --- sys/dev/cxgbe/iw_cxgbe/cm.c | 2 +- sys/dev/cxgbe/tom/t4_cpl_io.c | 6 +++--- sys/dev/cxgbe/tom/t4_ddp.c | 6 +++--- sys/dev/cxgbe/tom/t4_tom.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c index 329e99725a43..3cca89f71435 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cm.c +++ b/sys/dev/cxgbe/iw_cxgbe/cm.c @@ -68,7 +68,7 @@ struct cpl_set_tcb_rpl; #include "offload.h" #include "tom/t4_tom.h" -#define TOEPCB(so) ((struct toepcb *)(so_sototcpcb((so))->t_toe)) +#define TOEPCB(so) ((struct toepcb *)(sototcpcb((so))->t_toe)) #include "iw_cxgbe.h" #include diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index bfc9eb3b76f7..79c40658ba54 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -2053,7 +2053,7 @@ t4_uninit_cpl_io_handlers(void) #define aio_refs backend4 #define jobtotid(job) \ - (((struct toepcb *)(so_sototcpcb((job)->fd_file->f_data)->t_toe))->tid) + (((struct toepcb *)(sototcpcb((job)->fd_file->f_data)->t_toe))->tid) static void aiotx_free_job(struct kaiocb *job) @@ -2415,7 +2415,7 @@ t4_aiotx_cancel(struct kaiocb *job) struct toepcb *toep; so = job->fd_file->f_data; - tp = so_sototcpcb(so); + tp = sototcpcb(so); toep = tp->t_toe; MPASS(job->uaiocb.aio_lio_opcode == LIO_WRITE); sb = &so->so_snd; @@ -2432,7 +2432,7 @@ t4_aiotx_cancel(struct kaiocb *job) int t4_aio_queue_aiotx(struct socket *so, struct kaiocb *job) { - struct tcpcb *tp = so_sototcpcb(so); + struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; struct adapter *sc = td_adapter(toep->td); diff --git a/sys/dev/cxgbe/tom/t4_ddp.c b/sys/dev/cxgbe/tom/t4_ddp.c index 605157286bb2..ff7dc9ae279e 100644 --- a/sys/dev/cxgbe/tom/t4_ddp.c +++ b/sys/dev/cxgbe/tom/t4_ddp.c @@ -2137,7 +2137,7 @@ static void t4_aio_cancel_active(struct kaiocb *job) { struct socket *so = job->fd_file->f_data; - struct tcpcb *tp = so_sototcpcb(so); + struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; struct adapter *sc = td_adapter(toep->td); uint64_t valid_flag; @@ -2178,7 +2178,7 @@ static void t4_aio_cancel_queued(struct kaiocb *job) { struct socket *so = job->fd_file->f_data; - struct tcpcb *tp = so_sototcpcb(so); + struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; DDP_LOCK(toep); @@ -2197,7 +2197,7 @@ t4_aio_cancel_queued(struct kaiocb *job) int t4_aio_queue_ddp(struct socket *so, struct kaiocb *job) { - struct tcpcb *tp = so_sototcpcb(so); + struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c index dd214e91f0b3..a923fbaf1a30 100644 --- a/sys/dev/cxgbe/tom/t4_tom.c +++ b/sys/dev/cxgbe/tom/t4_tom.c @@ -1989,7 +1989,7 @@ t4_tom_deactivate(struct adapter *sc) static int t4_aio_queue_tom(struct socket *so, struct kaiocb *job) { - struct tcpcb *tp = so_sototcpcb(so); + struct tcpcb *tp = sototcpcb(so); struct toepcb *toep = tp->t_toe; int error;