Pull rdma fixes from Jason Gunthorpe: "Several recent regressions and some bug fixes: - Typo corrupting the max_recv_sge for cxgb4 - Regression from re-using kernel enums as a HW AbI in vmw_pvrdma - Sleeping inside a spinlock in hns - Revert the attempt to fix devlink deadlocks as the fix is more buggy - Typo in sysfs_emit_at conversions - Revert the removal of VLAN support in rxe" * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: Revert "RDMA/rxe: Remove VLAN code leftovers from RXE" RDMA/usnic: Fix misuse of sysfs_emit_at Revert "RDMA/mlx5: Fix devlink deadlock on net namespace deletion" RDMA/hns: Use mutex instead of spinlock for ida allocation RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC RDMA/cxgb4: Fix the reported max_recv_sge value
Showing the changes to include/linux (1 of 12 files). Show all
Unified · Split
| @@ -1209,22 +1209,4 @@ static inline bool mlx5_is_roce_enabled(struct mlx5_core_dev *dev) · 1208 unmodified lines | ||
| 1209 | 1209 | return val.vbool; |
| 1210 | 1210 | } |
| 1211 | 1211 | |
| 1212 | −/** | |
| 1213 | − * mlx5_core_net - Provide net namespace of the mlx5_core_dev | |
| 1214 | − * @dev: mlx5 core device | |
| 1215 | − * | |
| 1216 | − * mlx5_core_net() returns the net namespace of mlx5 core device. | |
| 1217 | − * This can be called only in below described limited context. | |
| 1218 | − * (a) When a devlink instance for mlx5_core is registered and | |
| 1219 | − * when devlink reload operation is disabled. | |
| 1220 | − * or | |
| 1221 | − * (b) during devlink reload reload_down() and reload_up callbacks | |
| 1222 | − * where it is ensured that devlink instance's net namespace is | |
| 1223 | − * stable. | |
| 1224 | − */ | |
| 1225 | −static inline struct net *mlx5_core_net(struct mlx5_core_dev *dev) | |
| 1226 | −{ | |
| 1227 | − return devlink_net(priv_to_devlink(dev)); | |
| 1228 | −} | |
| 1229 | − | |
| 1230 | 1212 | #endif /* MLX5_DRIVER_H */ |