[packages/rdma-core] - adjusted nes and cxgb3 patch for fuzz 0

[qboosh]

commit 567e5a90ddecf7f5f84411f01b43d0fa34cd42a7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 27 20:05:40 2021 +0200

    - adjusted nes and cxgb3 patch for fuzz 0

 rdma-core-cxgb3.patch | 4 ++--
 rdma-core-nes.patch   | 5 +++--
 rdma-core.spec        | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/rdma-core.spec b/rdma-core.spec
index fbb2270..c3836f1 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -19,10 +19,10 @@ Patch0:		%{name}-static.patch
 # restore cxgb3 and nes providers from rdma-core 26.1 (keep until dropping support for kernels < 5.5)
 # from https://github.com/linux-rdma/rdma-core/commit/c21a3cf5d9e4cef0904b4d47f1cb43be9efdbf90.patch cut down (to revert)
 Patch1:		%{name}-kernel-abi.patch
-# https://github.com/linux-rdma/rdma-core/commit/36588f5844af4ef1e5b0d6ad002fa1adf9032653.patch cut down (to revert)
-Patch2:		%{name}-cxgb3.patch
 # https://github.com/linux-rdma/rdma-core/commit/4daf5c91c1296683924cb9668c3d879da072756b.patch cut down (to revert)
-Patch3:		%{name}-nes.patch
+Patch2:		%{name}-nes.patch
+# https://github.com/linux-rdma/rdma-core/commit/36588f5844af4ef1e5b0d6ad002fa1adf9032653.patch cut down (to revert)
+Patch3:		%{name}-cxgb3.patch
 Patch4:		%{name}-providers-update.patch
 URL:		https://github.com/linux-rdma/rdma-core
 BuildRequires:	cmake >= 2.8.11
diff --git a/rdma-core-cxgb3.patch b/rdma-core-cxgb3.patch
index f912d66..e734959 100644
--- a/rdma-core-cxgb3.patch
+++ b/rdma-core-cxgb3.patch
@@ -79,8 +79,8 @@ diff --git a/kernel-boot/rdma-hw-modules.rules b/kernel-boot/rdma-hw-modules.rul
 index dde0ab8da..da4bbe363 100644
 --- a/kernel-boot/rdma-hw-modules.rules
 +++ b/kernel-boot/rdma-hw-modules.rules
-@@ -8,7 +8,6 @@ SUBSYSTEM!="net", GOTO="rdma_hw_modules_end"
- # RDMA.
+@@ -9,7 +9,6 @@ SUBSYSTEM!="net", GOTO="rdma_hw_modules_end"
+ 
  ENV{ID_NET_DRIVER}=="be2net", RUN{builtin}+="kmod load ocrdma"
  ENV{ID_NET_DRIVER}=="bnxt_en", RUN{builtin}+="kmod load bnxt_re"
 -ENV{ID_NET_DRIVER}=="cxgb3", RUN{builtin}+="kmod load iw_cxgb3"
diff --git a/rdma-core-nes.patch b/rdma-core-nes.patch
index 961c662..1d4f290 100644
--- a/rdma-core-nes.patch
+++ b/rdma-core-nes.patch
@@ -73,13 +73,14 @@ diff --git a/kernel-boot/rdma-hw-modules.rules b/kernel-boot/rdma-hw-modules.rul
 index da4bbe363..bee416dbe 100644
 --- a/kernel-boot/rdma-hw-modules.rules
 +++ b/kernel-boot/rdma-hw-modules.rules
-@@ -33,6 +33,5 @@ ENV{ID_NET_DRIVER}=="enic", RUN{builtin}+="kmod load usnic_verbs"
+@@ -33,7 +33,6 @@ ENV{ID_NET_DRIVER}=="enic", RUN{builtin}+="kmod load usnic_verbs"
  # ipathverbs
  # mthca
  # vmw_pvrdma
 -# nes
  
- LABEL="rdma_hw_modules_end"
+ LABEL="rdma_hw_modules_net_end"
+ 
 diff --git a/libibverbs/verbs.h b/libibverbs/verbs.h
 index 12a33a99a..13e7c63e7 100644
 --- a/libibverbs/verbs.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rdma-core.git/commitdiff/567e5a90ddecf7f5f84411f01b43d0fa34cd42a7