Simplify fix

Author: r-barnes

libibverbs/verbs.h

@@ -544,41 +544,49 @@ enum {
 	IBV_WC_IP_CSUM_OK_SHIFT	= 2
 };
 
-static const uint32_t IBV_WC_EX_WITH_BYTE_LEN		      = 1 << 0;
-static const uint32_t IBV_WC_EX_WITH_IMM		          = 1 << 1;
-static const uint32_t IBV_WC_EX_WITH_QP_NUM		          = 1 << 2;
-static const uint32_t IBV_WC_EX_WITH_SRC_QP		          = 1 << 3;
-static const uint32_t IBV_WC_EX_WITH_SLID		          = 1 << 4;
-static const uint32_t IBV_WC_EX_WITH_SL		              = 1 << 5;
-static const uint32_t IBV_WC_EX_WITH_DLID_PATH_BITS	      = 1 << 6;
-static const uint32_t IBV_WC_EX_WITH_COMPLETION_TIMESTAMP = 1 << 7;
-static const uint32_t IBV_WC_EX_WITH_CVLAN		          = 1 << 8;
-static const uint32_t IBV_WC_EX_WITH_FLOW_TAG		      = 1 << 9;
-static const uint32_t IBV_WC_EX_WITH_TM_INFO		      = 1 << 10;
-static const uint32_t IBV_WC_EX_WITH_COMPLETION_TIMESTAMP_WALLCLOCK	= 1 << 11;
-
-static const uint32_t IBV_WC_STANDARD_FLAGS = IBV_WC_EX_WITH_BYTE_LEN |
-				                              IBV_WC_EX_WITH_IMM	  |
-				                              IBV_WC_EX_WITH_QP_NUM	  |
-				                              IBV_WC_EX_WITH_SRC_QP	  |
-				                              IBV_WC_EX_WITH_SLID	  |
-				                              IBV_WC_EX_WITH_SL		  |
-				                              IBV_WC_EX_WITH_DLID_PATH_BITS;
-
-static const uint32_t IBV_CREATE_CQ_SUP_WC_FLAGS = IBV_WC_STANDARD_FLAGS               |
-				                                   IBV_WC_EX_WITH_COMPLETION_TIMESTAMP |
-				                                   IBV_WC_EX_WITH_CVLAN                |
-				                                   IBV_WC_EX_WITH_FLOW_TAG             |
-				                                   IBV_WC_EX_WITH_TM_INFO              |
-				                                   IBV_WC_EX_WITH_COMPLETION_TIMESTAMP_WALLCLOCK;
-
-static const uint32_t IBV_WC_GRH		    = 1 << 0;
-static const uint32_t IBV_WC_WITH_IMM		= 1 << 1;
-static const uint32_t IBV_WC_IP_CSUM_OK	    = 1 << IBV_WC_IP_CSUM_OK_SHIFT;
-static const uint32_t IBV_WC_WITH_INV		= 1 << 3;
-static const uint32_t IBV_WC_TM_SYNC_REQ	= 1 << 4;
-static const uint32_t IBV_WC_TM_MATCH		= 1 << 5;
-static const uint32_t IBV_WC_TM_DATA_VALID	= 1 << 6;
+enum ibv_create_cq_wc_flags {
+	IBV_WC_EX_WITH_BYTE_LEN		= 1 << 0,
+	IBV_WC_EX_WITH_IMM		= 1 << 1,
+	IBV_WC_EX_WITH_QP_NUM		= 1 << 2,
+	IBV_WC_EX_WITH_SRC_QP		= 1 << 3,
+	IBV_WC_EX_WITH_SLID		= 1 << 4,
+	IBV_WC_EX_WITH_SL		= 1 << 5,
+	IBV_WC_EX_WITH_DLID_PATH_BITS	= 1 << 6,
+	IBV_WC_EX_WITH_COMPLETION_TIMESTAMP	= 1 << 7,
+	IBV_WC_EX_WITH_CVLAN		= 1 << 8,
+	IBV_WC_EX_WITH_FLOW_TAG		= 1 << 9,
+	IBV_WC_EX_WITH_TM_INFO		= 1 << 10,
+	IBV_WC_EX_WITH_COMPLETION_TIMESTAMP_WALLCLOCK	= 1 << 11,
+};
+
+enum {
+	IBV_WC_STANDARD_FLAGS = IBV_WC_EX_WITH_BYTE_LEN		|
+				 IBV_WC_EX_WITH_IMM		|
+				 IBV_WC_EX_WITH_QP_NUM		|
+				 IBV_WC_EX_WITH_SRC_QP		|
+				 IBV_WC_EX_WITH_SLID		|
+				 IBV_WC_EX_WITH_SL		|
+				 IBV_WC_EX_WITH_DLID_PATH_BITS
+};
+
+enum {
+	IBV_CREATE_CQ_SUP_WC_FLAGS = (int)IBV_WC_STANDARD_FLAGS |
+				(int)IBV_WC_EX_WITH_COMPLETION_TIMESTAMP |
+				(int)IBV_WC_EX_WITH_CVLAN |
+				(int)IBV_WC_EX_WITH_FLOW_TAG |
+				(int)IBV_WC_EX_WITH_TM_INFO |
+				(int)IBV_WC_EX_WITH_COMPLETION_TIMESTAMP_WALLCLOCK
+};
+
+enum ibv_wc_flags {
+	IBV_WC_GRH		= 1 << 0,
+	IBV_WC_WITH_IMM		= 1 << 1,
+	IBV_WC_IP_CSUM_OK	= 1 << IBV_WC_IP_CSUM_OK_SHIFT,
+	IBV_WC_WITH_INV		= 1 << 3,
+	IBV_WC_TM_SYNC_REQ	= 1 << 4,
+	IBV_WC_TM_MATCH		= 1 << 5,
+	IBV_WC_TM_DATA_VALID	= 1 << 6,
+};
 
 struct ibv_wc {
 	uint64_t		wr_id;
@@ -602,17 +610,19 @@ struct ibv_wc {
 	uint8_t			dlid_path_bits;
 };
 
-static const uint32_t IBV_ACCESS_LOCAL_WRITE      = 1;
-static const uint32_t IBV_ACCESS_REMOTE_WRITE     = (1<<1);
-static const uint32_t IBV_ACCESS_REMOTE_READ      = (1<<2);
-static const uint32_t IBV_ACCESS_REMOTE_ATOMIC    = (1<<3);
-static const uint32_t IBV_ACCESS_MW_BIND          = (1<<4);
-static const uint32_t IBV_ACCESS_ZERO_BASED       = (1<<5);
-static const uint32_t IBV_ACCESS_ON_DEMAND        = (1<<6);
-static const uint32_t IBV_ACCESS_HUGETLB          = (1<<7);
-static const uint32_t IBV_ACCESS_FLUSH_GLOBAL     = (1 << 8);
-static const uint32_t IBV_ACCESS_FLUSH_PERSISTENT = (1 << 9);
-static const uint32_t IBV_ACCESS_RELAXED_ORDERING = IBV_ACCESS_OPTIONAL_FIRST;
+enum ibv_access_flags {
+	IBV_ACCESS_LOCAL_WRITE		= 1,
+	IBV_ACCESS_REMOTE_WRITE		= (1<<1),
+	IBV_ACCESS_REMOTE_READ		= (1<<2),
+	IBV_ACCESS_REMOTE_ATOMIC	= (1<<3),
+	IBV_ACCESS_MW_BIND		= (1<<4),
+	IBV_ACCESS_ZERO_BASED		= (1<<5),
+	IBV_ACCESS_ON_DEMAND		= (1<<6),
+	IBV_ACCESS_HUGETLB		= (1<<7),
+	IBV_ACCESS_FLUSH_GLOBAL		= (1 << 8),
+	IBV_ACCESS_FLUSH_PERSISTENT	= (1 << 9),
+	IBV_ACCESS_RELAXED_ORDERING	= IBV_ACCESS_OPTIONAL_FIRST,
+};
 
 struct ibv_mw_bind_info {
 	struct ibv_mr	*mr;

providers/mlx5/verbs.c

@@ -640,7 +640,7 @@ struct ibv_mr *mlx5_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
 	struct mlx5_mr *mr;
 	struct ibv_reg_mr cmd;
 	int ret;
-	uint32_t access = acc;
+	enum ibv_access_flags access = (enum ibv_access_flags)acc;
 	struct ib_uverbs_reg_mr_resp resp;
 
 	mr = calloc(1, sizeof(*mr));