aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/if_macvlan.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-02-18 05:46:50 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-18 14:08:38 -0800
commit501c774cb13c3ef8fb7fc5f08fa19473f7d9a0db (patch)
tree65db25ce76a5c038d69c304d9b6456e4f68e9f47 /include/linux/if_macvlan.h
parent02df55d28c6001a3cdb7a997a34a0b01f01d015e (diff)
downloadmrst-s0i3-test-501c774cb13c3ef8fb7fc5f08fa19473f7d9a0db.tar.gz
mrst-s0i3-test-501c774cb13c3ef8fb7fc5f08fa19473f7d9a0db.tar.xz
mrst-s0i3-test-501c774cb13c3ef8fb7fc5f08fa19473f7d9a0db.zip
net/macvtap: add vhost support
This adds support for passing a macvtap file descriptor into vhost-net, much like we already do for tun/tap. Most of the new code is taken from the respective patch in the tun driver and may get consolidated in the future. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Sridhar Samudrala <sri@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_macvlan.h')
-rw-r--r--include/linux/if_macvlan.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h
index f9cb9ba1475..b78a712247d 100644
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.h
@@ -7,6 +7,19 @@
#include <linux/netlink.h>
#include <net/netlink.h>
+#if defined(CONFIG_MACVTAP) || defined(CONFIG_MACVTAP_MODULE)
+struct socket *macvtap_get_socket(struct file *);
+#else
+#include <linux/err.h>
+#include <linux/errno.h>
+struct file;
+struct socket;
+static inline struct socket *macvtap_get_socket(struct file *f)
+{
+ return ERR_PTR(-EINVAL);
+}
+#endif /* CONFIG_MACVTAP */
+
struct macvlan_port;
struct macvtap_queue;