Patches for 4.16 that are dependent on patches sent to 4.15-rc. These are small clean ups for the vmw_pvrdma and i40iw drivers. * 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git: RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header RDMA/vmw_pvrdma: Use refcount_t instead of atomic_t RDMA/vmw_pvrdma: Use more specific sizeof in kcalloc RDMA/vmw_pvrdma: Clarify QP and CQ is_kernel logic RDMA/vmw_pvrdma: Add UAR SRQ macros in ABI header file i40iw: Change accelerated flag to bool
Showing the changes to include/uapi (1 of 40 files). Show all
Unified · Split
| @@ -52,12 +52,14 @@ · 51 unmodified lines | ||
| 52 | 52 | #define PVRDMA_UVERBS_ABI_VERSION 3 /* ABI Version. */ |
| 53 | 53 | #define PVRDMA_UAR_HANDLE_MASK 0x00FFFFFF /* Bottom 24 bits. */ |
| 54 | 54 | #define PVRDMA_UAR_QP_OFFSET 0 /* QP doorbell. */ |
| 55 | −#define PVRDMA_UAR_QP_SEND BIT(30) /* Send bit. */ | |
| 56 | −#define PVRDMA_UAR_QP_RECV BIT(31) /* Recv bit. */ | |
| 55 | +#define PVRDMA_UAR_QP_SEND (1 << 30) /* Send bit. */ | |
| 56 | +#define PVRDMA_UAR_QP_RECV (1 << 31) /* Recv bit. */ | |
| 57 | 57 | #define PVRDMA_UAR_CQ_OFFSET 4 /* CQ doorbell. */ |
| 58 | −#define PVRDMA_UAR_CQ_ARM_SOL BIT(29) /* Arm solicited bit. */ | |
| 59 | −#define PVRDMA_UAR_CQ_ARM BIT(30) /* Arm bit. */ | |
| 60 | −#define PVRDMA_UAR_CQ_POLL BIT(31) /* Poll bit. */ | |
| 58 | +#define PVRDMA_UAR_CQ_ARM_SOL (1 << 29) /* Arm solicited bit. */ | |
| 59 | +#define PVRDMA_UAR_CQ_ARM (1 << 30) /* Arm bit. */ | |
| 60 | +#define PVRDMA_UAR_CQ_POLL (1 << 31) /* Poll bit. */ | |
| 61 | +#define PVRDMA_UAR_SRQ_OFFSET 8 /* SRQ doorbell. */ | |
| 62 | +#define PVRDMA_UAR_SRQ_RECV (1 << 30) /* Recv bit. */ | |
| 61 | 63 | |
| 62 | 64 | enum pvrdma_wr_opcode { |
| 63 | 65 | PVRDMA_WR_RDMA_WRITE, |