diff --git a/0041-libhns-Support-congestion-control-algorithm-configur.patch b/0041-libhns-Support-congestion-control-algorithm-configur.patch index da3e6bbce692550e47ba1d49ce4239bbab9837ec..8cf0a3f334e3c387930dd52c7310ed1c92669cc3 100644 --- a/0041-libhns-Support-congestion-control-algorithm-configur.patch +++ b/0041-libhns-Support-congestion-control-algorithm-configur.patch @@ -1,8 +1,7 @@ -From 1b3ec79e4d617555c0e12a3fe12db7925d385ef6 Mon Sep 17 00:00:00 2001 +From 99e1e64edab954ce1895d83a3d6f4317bc12c444 Mon Sep 17 00:00:00 2001 From: Yixing Liu Date: Wed, 12 Apr 2023 17:01:09 +0800 -Subject: [PATCH 2/2] libhns: Support congestion control algorithm - configuration +Subject: [PATCH] libhns: Support congestion control algorithm configuration driver inclusion category: feature @@ -67,7 +66,7 @@ index 76c7adb..41e9599 100644 struct verbs_context ibv_ctx; void *uar; diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c -index 282ab74..6c6120c 100644 +index 282ab74..499735c 100644 --- a/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c @@ -89,10 +89,10 @@ int hns_roce_u_query_device(struct ibv_context *context, @@ -140,7 +139,7 @@ index 282ab74..6c6120c 100644 + cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_LDCP; + break; + case HNSDV_QP_CREATE_ENABLE_HC3: -+ cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_LDCP; ++ cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_HC3; + break; + case HNSDV_QP_CREATE_ENABLE_DIP: + cmd_flag->congest_type_flags |= HNS_ROCE_CREATE_QP_FLAGS_DIP; diff --git a/0077-libhns-Fix-parent-domain-unsupported-comp-mask.patch b/0077-libhns-Fix-parent-domain-unsupported-comp-mask.patch index faa9771111194d3197353725df207ab549ac59b9..1963fa4efa870c9de274449621756f9615dfc013 100644 --- a/0077-libhns-Fix-parent-domain-unsupported-comp-mask.patch +++ b/0077-libhns-Fix-parent-domain-unsupported-comp-mask.patch @@ -1,7 +1,7 @@ -From f912bc59d0b56b560a0097b5f738ba160a3e23eb Mon Sep 17 00:00:00 2001 +From 12f8951a6a98f82dd1f70afc23d66e328cf1988b Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Thu, 7 Dec 2023 09:47:59 +0800 -Subject: [PATCH 77/80] libhns: Fix parent domain unsupported comp mask +Subject: [PATCH] libhns: Fix parent domain unsupported comp mask driver inclusion category: bugfix @@ -55,17 +55,17 @@ Signed-off-by: Chengchang Tang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c -index e597e93..fae6126 100644 +index 34e8d07..ba3fef6 100644 --- a/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c @@ -238,7 +238,7 @@ struct ibv_pd *hns_roce_u_alloc_pad(struct ibv_context *context, - return NULL; - - if (attr->comp_mask) { + return NULL; + + if (attr->comp_mask) { - errno = EINVAL; + errno = EOPNOTSUPP; - return NULL; - } + return NULL; + } -- 2.25.1 diff --git a/rdma-core.spec b/rdma-core.spec index d8980bce9c65200965db644b3cfc52f717df2847..82082bc38e0d60b9fda75fd506ca962573dcfcf4 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core Version: 41.0 -Release: 24 +Release: 25 Summary: RDMA core userspace libraries and daemons License: GPLv2 or BSD Url: https://github.com/linux-rdma/rdma-core @@ -334,6 +334,12 @@ fi %{_mandir}/* %changelog +* Tue Dec 12 2023 Ran Zhou - 41.0-25 +- Type: bugfix +- ID: NA +- SUG: NA +- DESC: Fix congest type flags error and replace a corrupt patch + * Fri Dec 8 2023 Ran Zhou - 41.0-24 - Type: bugfix - ID: NA