summaryrefslogtreecommitdiff
path: root/include/linux/if_tun.h
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-08 09:45:47 +0400
committerLen Brown <len.brown@intel.com>2005-09-08 09:45:47 +0400
commit64e47488c913ac704d465a6af86a26786d1412a5 (patch)
treed3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/linux/if_tun.h
parent4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff)
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff)
downloadlinux-64e47488c913ac704d465a6af86a26786d1412a5.tar.xz
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/linux/if_tun.h')
-rw-r--r--include/linux/if_tun.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 096a85a58ae5..88aef7b86ef4 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -77,6 +77,7 @@ struct tun_struct {
#define TUNSETIFF _IOW('T', 202, int)
#define TUNSETPERSIST _IOW('T', 203, int)
#define TUNSETOWNER _IOW('T', 204, int)
+#define TUNSETLINK _IOW('T', 205, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001