net: forbid the reentrant RX

[mirror_qemu.git] / net / tap-bsd.c

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 0103a97bf6bfddb656df8d9915602223650b02d8..77aaf674b19dd498ba607045594dc869947c7c50 100644 (file)
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -22,9 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "tap_int.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "sysemu/sysemu.h"
+#include "qapi/error.h"
+#include "tap_int.h"
+#include "qemu/cutils.h"
 #include "qemu/error-report.h"
 
 #if defined(__NetBSD__) || defined(__FreeBSD__)
@@ -33,6 +35,10 @@
 #include <net/if_tap.h>
 #endif
 
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#endif
+
 #ifndef __FreeBSD__
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp)
@@ -53,7 +59,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
         if (*ifname) {
             snprintf(dname, sizeof dname, "/dev/%s", ifname);
         } else {
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) && OpenBSD < 201605
             snprintf(dname, sizeof dname, "/dev/tun%d", i);
 #else
             snprintf(dname, sizeof dname, "/dev/tap%d", i);
@@ -205,7 +211,7 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp)
 {
 }
 
-int tap_probe_vnet_hdr(int fd)
+int tap_probe_vnet_hdr(int fd, Error **errp)
 {
     return 0;
 }