---

yaml --- r: 183823 b: refs/heads/master c: 20d29d7 h: refs/heads/master i: 183821: c01f002 183819: dd31b23 183815: 24ff83b 183807: 6a6d42c v: v3
git-mirror · Feb 4, 2010 · ab11e16 · ab11e16
1 parent 50bdb19
commit ab11e16
Show file tree

Hide file tree

Showing 5 changed files with 596 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc0663d6b5e6d8e9b57f872a644c0aafd82361b7
+refs/heads/master: 20d29d7a916a47bf533b5709437fe735b6b5b79e
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -90,6 +90,18 @@ config MACVLAN
 	  To compile this driver as a module, choose M here: the module
 	  will be called macvlan.
 
+config MACVTAP
+	tristate "MAC-VLAN based tap driver (EXPERIMENTAL)"
+	depends on MACVLAN
+	help
+	  This adds a specialized tap character device driver that is based
+	  on the MAC-VLAN network interface, called macvtap. A macvtap device
+	  can be added in the same way as a macvlan device, using 'type
+	  macvlan', and then be accessed through the tap user space interface.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called macvtap.
+
 config EQUALIZER
 	tristate "EQL (serial line load balancing) support"
 	---help---

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -169,6 +169,7 @@ obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
 obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
+obj-$(CONFIG_MACVTAP) += macvtap.o
 obj-$(CONFIG_DE600) += de600.o
 obj-$(CONFIG_DE620) += de620.o
 obj-$(CONFIG_LANCE) += lance.o