[VirtualBox-kmod/el9] Add cs9.2.patch
commit 2afb1efa6446539656c3a38d171e4ec715b514c1
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 19 12:19:11 2022 +0100
Add cs9.2.patch
VirtualBox-kmod.spec | 9 ++++++++-
cs9.v2.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index ff88f0a..41aa5c8 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -40,7 +40,7 @@
Name: VirtualBox-kmod
Version: 6.1.34
-Release: 4%{?dist}
+Release: 5%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -49,6 +49,7 @@ 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: cs9.patch
+Patch2: cs9.v2.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc >=
%{version}%{vboxreltag} xz time elfutils-libelf-devel gcc
@@ -71,6 +72,9 @@ Kernel module for VirtualBox
tar --use-compress-program xz -xf
%{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
%patch1 -p1
+%if ! 0%{?fedora}
+%patch2 -p1
+%endif
popd
# error out if there was something wrong with kmodtool
@@ -134,6 +138,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Sun Jun 19 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-5
+- Add cs9.2.patch
+
* Sat Jun 18 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-4
- Add cs9.patch rfbz#(6328)
diff --git a/cs9.v2.patch b/cs9.v2.patch
new file mode 100644
index 0000000..628e8b4
--- /dev/null
+++ b/cs9.v2.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) || RTLNX_RHEL_MAJ_PREREQ(9,1)
++ 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
+