diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c
index d7aa54532..677a544cd 100644
--- a/srpt/src/ib_srpt.c
+++ b/srpt/src/ib_srpt.c
@@ -2498,9 +2498,9 @@ static bool srpt_is_target_enabled(struct scst_tgt *scst_tgt)
 /*
  * srpt_next_comp_vector() - Next completion vector >= sport->comp_vector
  */
-static u8 srpt_next_comp_vector(struct srpt_port *sport)
+static u16 srpt_next_comp_vector(struct srpt_port *sport)
 {
-	u8 comp_vector;
+	u16 comp_vector;
 
 	mutex_lock(&sport->mutex);
 	comp_vector = cpumask_next(sport->comp_vector, &sport->comp_v_mask);
diff --git a/srpt/src/ib_srpt.h b/srpt/src/ib_srpt.h
index e354ba1c2..fed94c307 100644
--- a/srpt/src/ib_srpt.h
+++ b/srpt/src/ib_srpt.h
@@ -379,7 +379,7 @@ struct srpt_rdma_ch {
 	struct list_head	cmd_wait_list;
 	uint16_t		pkey;
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) || defined(RHEL_RELEASE_CODE)
-	u8			comp_vector;
+	u16			comp_vector;
 #endif
 	bool			using_rdma_cm;
 	bool			processing_wait_list;
@@ -433,7 +433,7 @@ struct srpt_port {
 	struct list_head	nexus_list;
 	struct scst_tgt		*scst_tgt;
 	cpumask_t		comp_v_mask;
-	u8			comp_vector;
+	u16			comp_vector;
 	bool			enabled;
 	u8			port_id[64];
 };