All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org
Cc: Jason Wang <jasowang@redhat.com>,
	qemu-devel@nongnu.org, Brad Smith <brad@comstyle.com>
Subject: [PULL 10/10] tap-bsd: Remove special casing for older OpenBSD releases
Date: Sat,  8 May 2021 15:18:39 +0800	[thread overview]
Message-ID: <1620458319-5670-11-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1620458319-5670-1-git-send-email-jasowang@redhat.com>

From: Brad Smith <brad@comstyle.com>

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>
---
 net/tap-bsd.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 4f64f31..e45a6d1 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) {
-- 
2.7.4



  parent reply	other threads:[~2021-05-08  7:25 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-08  7:18 [PULL 00/10] Net patches Jason Wang
2021-05-08  7:18 ` [PULL 01/10] net/tap: Added TUNSETSTEERINGEBPF code Jason Wang
2021-05-08  7:18 ` [PULL 02/10] net: Added SetSteeringEBPF method for NetClientState Jason Wang
2021-05-08  7:18 ` [PULL 03/10] ebpf: Added eBPF RSS program Jason Wang
2021-05-08  7:18 ` [PULL 04/10] ebpf: Added eBPF RSS loader Jason Wang
2021-05-08  7:18 ` [PULL 05/10] virtio-net: Added eBPF RSS to virtio-net Jason Wang
2021-05-08  7:18 ` [PULL 06/10] docs: Added eBPF documentation Jason Wang
2021-05-08  7:18 ` [PULL 07/10] MAINTAINERS: Added eBPF maintainers information Jason Wang
2021-05-08  7:18 ` [PULL 08/10] hw/net/imx_fec: return 0xffff when accessing non-existing PHY Jason Wang
2021-05-08  7:18 ` [PULL 09/10] virtio-net: failover: add missing remove_migration_state_change_notifier() Jason Wang
2021-05-18 10:09   ` Laurent Vivier
2021-05-08  7:18 ` Jason Wang [this message]
2021-05-08  7:31 ` [PULL 00/10] Net patches no-reply
2021-05-08  7:59   ` Jason Wang
2021-05-11 20:20 ` Peter Maydell
2021-05-12  2:53   ` Jason Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1620458319-5670-11-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=brad@comstyle.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.