git: e1401f75790f - main - cxgbe: use standard sototcpcb() accessor macro to get socket's tcpcb

[Gleb Smirnoff]

The branch main has been updated by glebius:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e1401f75790f931bcdfc01734b1b37cfbb541a54

commit e1401f75790f931bcdfc01734b1b37cfbb541a54
Author:     Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2022-10-19 22:15:32 +0000
Commit:     Gleb Smirnoff <gleb...@freebsd.org>
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 <linux/module.h>
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;