diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-06 03:26:49 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-06 03:26:49 -0400 |
| commit | 58544feb67eac49d55cc3408aea1ae42521af90d (patch) | |
| tree | 6559cbeda7bcba3f722caf736d3dd4bb5367553b /include/linux | |
| parent | 2873957df0ead5b53fa00fddfb52ca3df38af4a9 (diff) | |
| parent | 55afbd0810922afe456f9e4e3abc84d69d3f8a15 (diff) | |
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.h | 2 |
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 @@ | |||
| 51 | #define TUNSETSNDBUF _IOW('T', 212, int) | 51 | #define TUNSETSNDBUF _IOW('T', 212, int) |
| 52 | #define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog) | 52 | #define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog) |
| 53 | #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) | 53 | #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) |
| 54 | #define TUNGETVNETHDRSZ _IOR('T', 215, int) | ||
| 55 | #define TUNSETVNETHDRSZ _IOW('T', 216, int) | ||
| 54 | 56 | ||
| 55 | /* TUNSETIFF ifr flags */ | 57 | /* TUNSETIFF ifr flags */ |
| 56 | #define IFF_TUN 0x0001 | 58 | #define IFF_TUN 0x0001 |