From: Jason Gunthorpe <jgg@nvidia.com>
Date: Thu, 17 Sep 2020 18:12:22 +0000 (-0300)
Subject: Merge branch 'mlx5_active_speed' into rdma.git for-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5dee5872f87552cfb173c899d35fc1413c2aa77f;p=linux.git

Merge branch 'mlx5_active_speed' into rdma.git for-next

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
---

5dee5872f87552cfb173c899d35fc1413c2aa77f
diff --cc drivers/infiniband/sw/rxe/rxe.c
index 43b327b53e262,77f2c7cd1216c..95f0de0c8b49c
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@@ -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");
  }