Changeset 87785 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

Timestamp:

Feb 17, 2021 7:25:12 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142841

Message:

NetFlt/Linux: VBoxNetFlt-linux.c doesn't build on Linux kernel 5.11 since <linux/netdevice.h> no longer includes <linux/ethtool.h>. ticketref:20198

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -36 +36 @@
 #include "product-generated.h"
 #if RTLNX_VER_MIN(2,6,24)
-#include <linux/nsproxy.h>
+# include <linux/nsproxy.h>
 #endif
 #include <linux/netdevice.h>
+#if RTLNX_VER_MAX(2,6,29) || RTLNX_VER_MIN(5,11,0)
+# include <linux/ethtool.h>
+#endif
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
@@ -47 +50 @@
 #include <linux/if_vlan.h>
 #if RTLNX_VER_MIN(4,5,0)
-#include <uapi/linux/pkt_cls.h>
+# include <uapi/linux/pkt_cls.h>
 #endif
 #include <net/ipv6.h>
@@ -330 +333 @@
 
 # if RTLNX_VER_MAX(2,6,29)
-
-# include <linux/ethtool.h>
 
 typedef struct ethtool_ops OVR_OPSTYPE;