OSDN Git Service

Merge branch 'mlx5_active_speed' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Thu, 17 Sep 2020 18:12:22 +0000 (15:12 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Fri, 18 Sep 2020 13:31:45 +0000 (10:31 -0300)
Leon Romanovsky says:

====================
IBTA declares speed as 16 bits, but kernel stores it in u8. This series
fixes in-kernel declaration while keeping external interface intact.
====================

Based on the mlx5-next branch at
     git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.

* branch 'mlx5_active_speed':
  RDMA: Fix link active_speed size
  RDMA/mlx5: Delete duplicated mlx5_ptys_width enum
  net/mlx5: Refactor query port speed functions

19 files changed:
1  2 
.clang-format
drivers/infiniband/core/cq.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/bnxt_re/ib_verbs.c
drivers/infiniband/hw/bnxt_re/qplib_fp.c
drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
drivers/infiniband/hw/qedr/verbs.c
drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h
drivers/infiniband/sw/rxe/rxe.c
drivers/infiniband/sw/rxe/rxe.h
drivers/infiniband/sw/rxe/rxe_mr.c
drivers/infiniband/sw/rxe/rxe_sysfs.c
drivers/infiniband/sw/rxe/rxe_verbs.c
drivers/infiniband/ulp/isert/ib_isert.c
drivers/infiniband/ulp/rtrs/rtrs-srv.c
include/rdma/ib_verbs.h

diff --cc .clang-format
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -296,7 -327,9 +299,8 @@@ static void __exit rxe_module_exit(void
        rdma_link_unregister(&rxe_link_ops);
        ib_unregister_driver(RDMA_DRIVER_RXE);
        rxe_net_exit();
 -      rxe_cache_exit();
  
+       rxe_initialized = false;
        pr_info("unloaded\n");
  }
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge