Commit 370a63e2 authored by Michal Berger's avatar Michal Berger Committed by Jim Harris
Browse files

pkgdep/git: Patch for ice targeting latest 5.19 kernels 



Currently, fedora36 is shipped with the 5.19 kernel.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 3e917320

test/common/config/pkgdep/git

+4 −0
Original line number Diff line number Diff line
@@ -514,6 +514,10 @@ function install_ice() { 
		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/ice/0001-ringparam-incompatible-pointer-types.patch"



	if ge "$kernel_ver" 5.19.0; then

		patch --dir="$GIT_REPOS/ice-$ICE_VERSION" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/ice/0001-ext-ack.patch"



	(

		cd "$GIT_REPOS/ice-$ICE_VERSION/src"

		sudo make -j"$(nproc)" install

test/common/config/pkgdep/patches/ice/0001-ext-ack.patch

0 → 100644
+23 −0
Original line number Diff line number Diff line 
This essentially duplicates a portion of the following patch that's already

available in the upstream version of the ice driver:



https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca4567f1e6f66



---

 src/ice_main.c | 2 +-

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



diff --git a/src/ice_main.c b/src/ice_main.c

index ab5e57c..a81502f 100644

--- a/src/ice_main.c

+++ b/src/ice_main.c

@@ -6951,7 +6951,7 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],

 static int

 ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],

 	    struct net_device *dev, const unsigned char *addr,

-	    __always_unused u16 vid)

+	    __always_unused u16 vid, struct netlink_ext_ack *extack)

 #else

 static int

 ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],

--