aboutsummaryrefslogtreecommitdiff
path: root/net/tap.c
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-22 17:49:10 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-30 08:39:28 -0500
commit88b3ec02b2b17871cd21be1e7588489636f3bebb (patch)
tree2b5f44c7df2e55b45407cfd767a49ac1454ea3d2 /net/tap.c
parent966ea5ec4fb14d4b420715e7aadc5dfd3ea5add2 (diff)
net: move AIX code into net/tap-aix.c
Okay, this makes the tap options available on AIX even though there's no support, but if we want to do it right we should have not compile the tap code at all on AIX using e.g. CONFIG_TAP. Signed-off-by: Mark McLoughlin <markmc@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'net/tap.c')
-rw-r--r--net/tap.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/net/tap.c b/net/tap.c
index 056fefe565..560e0e4228 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -42,8 +42,6 @@
#include "net/tap-linux.h"
#endif
-#if !defined(_AIX)
-
/* Maximum GSO packet size (64k) plus plenty of room for
* the ethernet and virtio_net headers
*/
@@ -349,13 +347,6 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
return s;
}
-#ifdef _AIX
-int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
-{
- fprintf (stderr, "no tap on AIX\n");
- return -1;
-}
-#else
int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required)
{
struct ifreq ifr;
@@ -400,7 +391,6 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required
fcntl(fd, F_SETFL, O_NONBLOCK);
return fd;
}
-#endif
static int launch_script(const char *setup_script, const char *ifname, int fd)
{
@@ -551,5 +541,3 @@ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan
return 0;
}
-
-#endif /* !defined(_AIX) */