Commit 1c5a5ee6 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

pkgdep/git: Patch IRDMA driver to address changes in latest 6.10 kernels 



Change-Id: Ib97ffc1353738b4b8e7a089e60b243a3806080a8
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24552


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
parent 92b7734c

test/common/config/pkgdep/git

+6 −0
Original line number Diff line number Diff line
@@ -324,6 +324,12 @@ function install_irdma() { 
	rm -rf "$GIT_REPOS/rdma-core-$RDMA_CORE_VERSION"



	curl -L -o- "$IRDMA_DRIVER" | tar -C "$GIT_REPOS" -xzf -



	if ge "$kernel_ver" 6.10; then

		patch --dir="$GIT_REPOS/irdma-$IRDMA_VERSION" -p1  \

			< "$rootdir/test/common/config/pkgdep/patches/irdma/0001-ip_route_output.patch"

	fi



	[[ -e $GIT_REPOS/irdma-$IRDMA_VERSION/build.sh ]]



	(

test/common/config/pkgdep/patches/irdma/0001-ip_route_output.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
See: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ec20b28300

---

 src/irdma/cm.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/src/irdma/cm.c b/src/irdma/cm.c

index c1e1884..dd65d0f 100644

--- a/src/irdma/cm.c

+++ b/src/irdma/cm.c

@@ -1985,7 +1985,7 @@ static int irdma_addr_resolve_neigh(struct irdma_device *iwdev, u32 src_ip,

 	__be32 dst_ipaddr = htonl(dst_ip);

 	__be32 src_ipaddr = htonl(src_ip);

 

-	rt = ip_route_output(&init_net, dst_ipaddr, src_ipaddr, 0, 0);

+	rt = ip_route_output(&init_net, dst_ipaddr, src_ipaddr, 0, 0, RT_SCOPE_UNIVERSE);

 	if (IS_ERR(rt)) {

 		ibdev_dbg(&iwdev->ibdev, "CM: ip_route_output fail\n");

 		return -EINVAL;

--