diff options
| author |  Jason Gunthorpe <jgg@nvidia.com>
| 2023-06-27 14:06:29 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com>
| 2023-06-27 14:06:29 -0300 |
| commit | 5f004bcaee4cb552cf1b46a505f18f08777db7e5 (patch) | |
| tree | c81bdd8e01ba8de9862c8bdb1b210559d4bcf154 /include/net/mana | |
| parent | RDMA/bnxt_re: Fix an IS_ERR() vs NULL check (diff) | |
| parent | Linux 6.4 (diff) | |
| download | linux-5f004bcaee4cb552cf1b46a505f18f08777db7e5.tar.gz linux-5f004bcaee4cb552cf1b46a505f18f08777db7e5.tar.bz2 linux-5f004bcaee4cb552cf1b46a505f18f08777db7e5.zip | |
Merge tag 'v6.4' into rdma.git for-next
Linux 6.4
Resolve conflicts between rdma rc and next in rxe_cq matching linux-next:
drivers/infiniband/sw/rxe/rxe_cq.c:
https://lore.kernel.org/r/20230622115246.365d30ad@canb.auug.org.au
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'include/net/mana')
| -rw-r--r-- | include/net/mana/mana.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/mana/mana.h b/include/net/mana/mana.h index 1512bd48df81..024ad8ddb27e 100644 --- a/include/net/mana/mana.h +++ b/include/net/mana/mana.h @@ -347,10 +347,8 @@ struct mana_tx_qp { struct mana_ethtool_stats { u64 stop_queue; u64 wake_queue; - u64 tx_cqes; u64 tx_cqe_err; u64 tx_cqe_unknown_type; - u64 rx_cqes; u64 rx_coalesced_err; u64 rx_cqe_unknown_type; }; |