[VirtualBox-kmod/el7] add kernel 5.18 patch

commit ebeea66404ec36621bcb848de6f667cb7ede992e Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Thu Apr 21 12:54:02 2022 +0100 add kernel 5.18 patch ...Drivers-VBoxNetFlt-Initial-support-for-ke.patch | 32 ++++++++++++++++++++++ VirtualBox-kmod.spec | 8 ++++-- 2 files changed, 38 insertions(+), 2 deletions(-) --- diff --git a/0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch b/0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch new file mode 100644 index 0000000..d2e1316 --- /dev/null +++ b/0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch @@ -0,0 +1,32 @@ +From 94e81a17ce6c02791b1f343281b7191b210dccb5 Mon Sep 17 00:00:00 2001 +From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> +Date: Wed, 6 Apr 2022 17:05:49 +0000 +Subject: [PATCH] Linux: Host Drivers: VBoxNetFlt: Initial support for kernel + 5.18-rc1, bugref:10209. + +git-svn-id: http://www.virtualbox.org/svn/vbox@94501 cfe28804-0f27-0410-a406-dd0f0b0b656f +--- + .../VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +index 08d985049ec..ef54e7fd8af 100644 +--- a/vboxnetflt/linux/VBoxNetFlt-linux.c ++++ b/vboxnetflt/linux/VBoxNetFlt-linux.c +@@ -2311,7 +2311,13 @@ int vboxNetFltPortOsXmit(PVBOXNETFLTINS pThis, void *pvIfData, PINTNETSG pSG, u + vboxNetFltDumpPacket(pSG, true, "host", (fDst & INTNETTRUNKDIR_WIRE) ? 0 : 1); + Log6(("vboxNetFltPortOsXmit: pBuf->cb dump:\n%.*Rhxd\n", sizeof(pBuf->cb), pBuf->cb)); + Log6(("vboxNetFltPortOsXmit: netif_rx_ni(%p)\n", pBuf)); ++#if RTLNX_VER_MIN(5,18,0) ++ local_bh_disable(); ++ err = netif_rx(pBuf); ++ local_bh_enable(); ++#else + err = netif_rx_ni(pBuf); ++#endif + if (err) + rc = RTErrConvertFromErrno(err); + } +-- +2.34.1 + diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index f892fd8..2f020e2 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -34,7 +34,7 @@ Name: VirtualBox-kmod Version: 6.1.34 -Release: 1%{?dist} +Release: 2%{?dist} #Release: 1%%{?prerel:.%%{prerel}}%%{?dist} Summary: Kernel module for VirtualBox @@ -42,6 +42,7 @@ License: GPLv2 or CDDL URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt +Patch1: 0001-Linux-Host-Drivers-VBoxNetFlt-Initial-support-for-ke.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >= %{version}%{vboxreltag} xz time elfutils-libelf-devel gcc @@ -63,7 +64,7 @@ Kernel module for VirtualBox %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz pushd %{name}-%{version} -#patch1 -p1 +%patch1 -p1 popd # error out if there was something wrong with kmodtool @@ -127,6 +128,9 @@ DIRS=$(ls %{name}-%{version} |wc -l) %changelog +* Thu Apr 21 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.34-2 +- add kernel 5.18 patch + * Wed Apr 20 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.34-1 - Update to 6.1.34 - Enable binary kmods on el repos