From e261954da65ca5a131bca285c70629b35404689f Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Wed, 31 Oct 2012 19:45:59 +0000 Subject: [PATCH] --- yaml --- r: 340567 b: refs/heads/master c: bbb009941efaece3898910a862f6d23aa55d6ba8 h: refs/heads/master i: 340565: f2a4be50778b8d2988241a34cafa4d919011c096 340563: b22883be2e27f8279da84240be49194cb0f06049 340559: 858ee76dbfe8b4774fd6eb29086ba228a6c47301 v: v3 --- [refs] | 2 +- trunk/include/uapi/linux/if_tun.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4b003bfef5f7..32b382140cef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e914fc70793f540015bd99744cd456b8d7fdfbd +refs/heads/master: bbb009941efaece3898910a862f6d23aa55d6ba8 diff --git a/trunk/include/uapi/linux/if_tun.h b/trunk/include/uapi/linux/if_tun.h index 25a585ce23e6..8ef3a87b58a0 100644 --- a/trunk/include/uapi/linux/if_tun.h +++ b/trunk/include/uapi/linux/if_tun.h @@ -34,6 +34,7 @@ #define TUN_ONE_QUEUE 0x0080 #define TUN_PERSIST 0x0100 #define TUN_VNET_HDR 0x0200 +#define TUN_TAP_MQ 0x0400 /* Ioctl defines */ #define TUNSETNOCSUM _IOW('T', 200, int) @@ -61,6 +62,7 @@ #define IFF_ONE_QUEUE 0x2000 #define IFF_VNET_HDR 0x4000 #define IFF_TUN_EXCL 0x8000 +#define IFF_MULTI_QUEUE 0x0100 /* Features for GSO (TUNSETOFFLOAD). */ #define TUN_F_CSUM 0x01 /* You can hand me unchecksummed packets. */