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/uapi (1 of 12 files). Show all
Unified · Split
| @@ -133,6 +133,13 @@ enum pvrdma_wc_flags { · 132 unmodified lines | |||
| 133 | PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_NETWORK_HDR_TYPE, | 133 | PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_NETWORK_HDR_TYPE, |
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | enum pvrdma_network_type { | ||
| 137 | PVRDMA_NETWORK_IB, | ||
| 138 | PVRDMA_NETWORK_ROCE_V1 = PVRDMA_NETWORK_IB, | ||
| 139 | PVRDMA_NETWORK_IPV4, | ||
| 140 | PVRDMA_NETWORK_IPV6 | ||
| 141 | }; | ||
| 142 | |||
| 136 | struct pvrdma_alloc_ucontext_resp { | 143 | struct pvrdma_alloc_ucontext_resp { |
| 137 | __u32 qp_tab_size; | 144 | __u32 qp_tab_size; |
| 138 | __u32 reserved; | 145 | __u32 reserved; |