summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-06 00:26:49 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-06 00:26:49 -0700
commit58544feb67eac49d55cc3408aea1ae42521af90d (patch)
tree6559cbeda7bcba3f722caf736d3dd4bb5367553b /include/linux
parent2873957df0ead5b53fa00fddfb52ca3df38af4a9 (diff)
parent55afbd0810922afe456f9e4e3abc84d69d3f8a15 (diff)
downloadlinux-58544feb67eac49d55cc3408aea1ae42521af90d.tar.gz
linux-58544feb67eac49d55cc3408aea1ae42521af90d.tar.bz2
linux-58544feb67eac49d55cc3408aea1ae42521af90d.zip
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_tun.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 1350a246893a..06b1829731fd 100644
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -51,6 +51,8 @@
#define TUNSETSNDBUF _IOW('T', 212, int)
#define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog)
#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
+#define TUNGETVNETHDRSZ _IOR('T', 215, int)
+#define TUNSETVNETHDRSZ _IOW('T', 216, int)
/* TUNSETIFF ifr flags */
#define IFF_TUN 0x0001