[arch-commits] Commit in virtualbox/trunk (020-linux518.patch PKGBUILD)

[Jan Steffens]

    Date: Tuesday, May 24, 2022 @ 21:52:08
  Author: heftig
Revision: 1210264

6.1.34-3: Add a patch for Linux 5.18

Added:
  virtualbox/trunk/020-linux518.patch
Modified:
  virtualbox/trunk/PKGBUILD

--------------------+
 020-linux518.patch |   16 ++++++++++++++++
 PKGBUILD           |    8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

Added: 020-linux518.patch
===================================================================
--- 020-linux518.patch	                        (rev 0)
+++ 020-linux518.patch	2022-05-24 21:52:08 UTC (rev 1210264)
@@ -0,0 +1,16 @@
+Index: trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+===================================================================
+--- trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
++++ trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -2312,5 +2312,11 @@
+                 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);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-24 21:51:47 UTC (rev 1210263)
+++ PKGBUILD	2022-05-24 21:52:08 UTC (rev 1210264)
@@ -10,7 +10,7 @@
          'virtualbox-ext-vnc')
 pkgver=6.1.34
 _tarver=${pkgver}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://virtualbox.org/'
 license=('GPL' 'custom')
@@ -75,7 +75,8 @@
         '013-Makefile.patch'
         '017-fix-narrowing-conversion.patch'
         '018-xclient.patch'
-        '019-vboxr0-cflags.patch')
+        '019-vboxr0-cflags.patch'
+        '020-linux518.patch')
 sha256sums=('9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49'
             '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
             '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
@@ -101,7 +102,8 @@
             'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
             '5aac692909a0a0ec56b08bdece9e42cf7463abdca9da2f990d441ff463be6a99'
             'cac5a573e9ed5aafb2f469c2e6fffb8cd4f389bbadba5a968c9f65be7a72fee3'
-            '25066d566042a3b3d6dee805fe783ca07fd3c3671a098db2b5f09aeb07624cd2')
+            '25066d566042a3b3d6dee805fe783ca07fd3c3671a098db2b5f09aeb07624cd2'
+            '1bdce861cb3609256da3b0ce07cab59d17801d48fa67c55b2c4dad9b09014f47')
 
 prepare() {
     cd "VirtualBox-$pkgver"