From: Brad Smith <brad@comstyle.com>
Date: Fri, 26 Mar 2021 23:49:12 +0000 (-0400)
Subject: tap-bsd: Remove special casing for older OpenBSD releases
X-Git-Tag: v6.1.0-rc0~95^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f8a39494aded9f2026a26b137378ea2ee3d5338;p=thirdparty%2Fqemu.git

tap-bsd: Remove special casing for older OpenBSD releases

OpenBSD added support for tap(4) 10 releases ago.

Remove the special casing for older releases.

Signed-off-by: Brad Smith <brad@comstyle.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 77aaf674b19..59dfcdfae00 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -35,10 +35,6 @@
 #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)
@@ -59,11 +55,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__) && OpenBSD < 201605
-            snprintf(dname, sizeof dname, "/dev/tun%d", i);
-#else
             snprintf(dname, sizeof dname, "/dev/tap%d", i);
-#endif
         }
         TFR(fd = open(dname, O_RDWR));
         if (fd >= 0) {