1
0
forked from pool/virtualbox

- Update "fixes_for_leap15.patch" for wait queue API changes.

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=382
This commit is contained in:
Larry Finger 2017-11-11 03:41:47 +00:00 committed by Git OBS Bridge
parent cdc999e54d
commit f3efb31ed1
2 changed files with 18 additions and 17 deletions

View File

@ -11,31 +11,27 @@ Index: VirtualBox-5.1.30/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
wait_queue_entry_t WaitQE;
#else
wait_queue_t WaitQE;
Index: VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
Index: VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- VirtualBox-5.1.28.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-5.1.28/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -124,6 +124,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
# define bstats stats
# define qstats stats
# endif
+#endif
+
+# if 1
+#define SKB_GSO_UDP 0
--- VirtualBox-5.1.30.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-5.1.30/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -130,6 +130,10 @@ typedef struct VBOXNETFLTNOTIFIER *PVBOX
#define SKB_GSO_UDP 0
#endif
+# if 1
+#define SKB_GSO_UDP 0
+#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
@@ -722,9 +726,11 @@ static struct sk_buff *vboxNetFltLinuxSk
# define VBOX_HAVE_SKB_VLAN
#else
@@ -726,7 +730,7 @@ static struct sk_buff *vboxNetFltLinuxSk
case PDMNETWORKGSOTYPE_IPV4_TCP:
fGsoType = SKB_GSO_TCPV4;
break;
-# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+# if 1
case PDMNETWORKGSOTYPE_IPV4_UDP:
fGsoType = SKB_GSO_UDP;
break;
+#endif
case PDMNETWORKGSOTYPE_IPV6_TCP:
fGsoType = SKB_GSO_TCPV6;
break;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Nov 11 03:40:07 UTC 2017 - Larry.Finger@lwfinger.net
- Update "fixes_for_leap15.patch" for wait queue API changes.
-------------------------------------------------------------------
Wed Nov 8 02:08:27 UTC 2017 - Larry.Finger@lwfinger.net