2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 6bbb9d8100c90deb4843bfa3cf36e75b843c495b Mon Sep 17 00:00:00 2001
|
|
From: Brad Smith <brad@comstyle.com>
|
|
Date: Sat, 3 Aug 2013 22:20:41 -0400
|
|
Subject: [PATCH] tap: Use numbered tap/tun devices on all *BSD OS's
|
|
|
|
The following patch simplifies the *BSD tap/tun code and makes use of numbered
|
|
tap/tun interfaces on all *BSD OS's. NetBSD has a patch in their pkgsrc tree
|
|
to make use of this feature and DragonFly also supports this as well.
|
|
|
|
Signed-off-by: Brad Smith <brad@comstyle.com>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit aa4f082f7526d39dac8e2ca64d192d858014ee10)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
net/tap-bsd.c | 11 -----------
|
|
1 file changed, 11 deletions(-)
|
|
|
|
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
|
|
index f61d580..90f8a02 100644
|
|
--- a/net/tap-bsd.c
|
|
+++ b/net/tap-bsd.c
|
|
@@ -44,8 +44,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
|
|
struct stat s;
|
|
#endif
|
|
|
|
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \
|
|
- defined(__OpenBSD__) || defined(__APPLE__)
|
|
/* if no ifname is given, always start the search from tap0/tun0. */
|
|
int i;
|
|
char dname[100];
|
|
@@ -76,15 +74,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
|
|
dname, strerror(errno));
|
|
return -1;
|
|
}
|
|
-#else
|
|
- TFR(fd = open("/dev/tap", O_RDWR));
|
|
- if (fd < 0) {
|
|
- fprintf(stderr,
|
|
- "warning: could not open /dev/tap: no virtual network emulation: %s\n",
|
|
- strerror(errno));
|
|
- return -1;
|
|
- }
|
|
-#endif
|
|
|
|
#ifdef TAPGIFNAME
|
|
if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) {
|