[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/15] net: move tap_probe_vnet_hdr() to tap-linux.c
From: |
Mark McLoughlin |
Subject: |
[Qemu-devel] [PATCH 13/15] net: move tap_probe_vnet_hdr() to tap-linux.c |
Date: |
Thu, 22 Oct 2009 17:49:14 +0100 |
Only Linux has support for IFF_VNET_HDR
Signed-off-by: Mark McLoughlin <address@hidden>
---
net/tap-aix.c | 4 ++++
net/tap-bsd.c | 5 +++++
net/tap-linux.c | 12 ++++++++++++
net/tap-solaris.c | 5 +++++
net/tap.c | 12 ------------
net/tap.h | 1 +
6 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/net/tap-aix.c b/net/tap-aix.c
index 3f9ccdd..27143ff 100644
--- a/net/tap-aix.c
+++ b/net/tap-aix.c
@@ -36,3 +36,7 @@ int tap_set_sndbuf(int fd, QemuOpts *opts)
return 0;
}
+int tap_probe_vnet_hdr(int fd)
+{
+ return 0;
+}
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index e28615f..1cdde90 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -65,3 +65,8 @@ int tap_set_sndbuf(int fd, QemuOpts *opts)
{
return 0;
}
+
+int tap_probe_vnet_hdr(int fd)
+{
+ return 0;
+}
diff --git a/net/tap-linux.c b/net/tap-linux.c
index 6c3b6e3..0059404 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -99,3 +99,15 @@ int tap_set_sndbuf(int fd, QemuOpts *opts)
}
return 0;
}
+
+int tap_probe_vnet_hdr(int fd)
+{
+ struct ifreq ifr;
+
+ if (ioctl(fd, TUNGETIFF, &ifr) != 0) {
+ qemu_error("TUNGETIFF ioctl() failed: %s\n", strerror(errno));
+ return 0;
+ }
+
+ return ifr.ifr_flags & IFF_VNET_HDR;
+}
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index de5855a..3f48e57 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -188,3 +188,8 @@ int tap_set_sndbuf(int fd, QemuOpts *opts)
{
return 0;
}
+
+int tap_probe_vnet_hdr(int fd)
+{
+ return 0;
+}
diff --git a/net/tap.c b/net/tap.c
index df2cfbe..3f6722e 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -239,18 +239,6 @@ void tap_using_vnet_hdr(VLANClientState *vc, int
using_vnet_hdr)
s->using_vnet_hdr = using_vnet_hdr;
}
-static int tap_probe_vnet_hdr(int fd)
-{
- struct ifreq ifr;
-
- if (ioctl(fd, TUNGETIFF, &ifr) != 0) {
- qemu_error("TUNGETIFF ioctl() failed: %s\n", strerror(errno));
- return 0;
- }
-
- return ifr.ifr_flags & IFF_VNET_HDR;
-}
-
void tap_set_offload(VLANClientState *vc, int csum, int tso4,
int tso6, int ecn, int ufo)
{
diff --git a/net/tap.h b/net/tap.h
index 0d67c24..de729a7 100644
--- a/net/tap.h
+++ b/net/tap.h
@@ -44,5 +44,6 @@ void tap_using_vnet_hdr(VLANClientState *vc, int
using_vnet_hdr);
void tap_set_offload(VLANClientState *vc, int csum, int tso4, int tso6, int
ecn, int ufo);
int tap_set_sndbuf(int fd, QemuOpts *opts);
+int tap_probe_vnet_hdr(int fd);
#endif /* QEMU_NET_TAP_H */
--
1.6.2.5
- [Qemu-devel] [PATCH 00/15] Some networking code re-organization, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 03/15] net: move tap-win32.c under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 13/15] net: move tap_probe_vnet_hdr() to tap-linux.c,
Mark McLoughlin <=
- [Qemu-devel] [PATCH 06/15] net: split all the tap code out into net/tap.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 01/15] net: move net-queue.[ch] under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 02/15] net: move net-checksum.c under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 07/15] net: split BSD tap_open() out into net/tap-bsd.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 04/15] net: move more stuff into net/tap-win32.c, add net/tap.h, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 14/15] net: move tap_set_offload() code into tap-linux.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 05/15] net: move tap-linux.h under net/, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 08/15] net: move solaris code to net/tap-solaris.c, Mark McLoughlin, 2009/10/22
- [Qemu-devel] [PATCH 12/15] net: move tap_set_sndbuf() to tap-linux.c, Mark McLoughlin, 2009/10/22