Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

torvalds · torvalds · commit b183f251e202 · 2025-09-22T11:12:29.000-07:00
Pull rdma fix from Jason Gunthorpe:
 "Just a one line change, was expecting more rc stuff, but it has been
  quiet.

   - Fix mlx5 devx event delivery to userspace for certain kinds of SRQs"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/mlx5: Fix obj_type mismatch for SRQ event subscriptions
diff --git a/drivers/infiniband/hw/mlx5/devx.c b/drivers/infiniband/hw/mlx5/devx.c
@@ -233,6 +233,7 @@ static u16 get_legacy_obj_type(u16 opcode)
 {
 	switch (opcode) {
 	case MLX5_CMD_OP_CREATE_RQ:
+	case MLX5_CMD_OP_CREATE_RMP:
 		return MLX5_EVENT_QUEUE_TYPE_RQ;
 	case MLX5_CMD_OP_CREATE_QP:
 		return MLX5_EVENT_QUEUE_TYPE_QP;

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ static u16 get_legacy_obj_type(u16 opcode)`
`233`	`233`	`{`
`234`	`234`	`switch (opcode) {`
`235`	`235`	`case MLX5_CMD_OP_CREATE_RQ:`
	`236`	`+ case MLX5_CMD_OP_CREATE_RMP:`
`236`	`237`	`return MLX5_EVENT_QUEUE_TYPE_RQ;`
`237`	`238`	`case MLX5_CMD_OP_CREATE_QP:`
`238`	`239`	`return MLX5_EVENT_QUEUE_TYPE_QP;`