---

yaml --- r: 340567 b: refs/heads/master c: bbb0099 h: refs/heads/master i: 340565: f2a4be5 340563: b22883b 340559: 858ee76 v: v3
git-mirror · Nov 1, 2012 · e261954 · e261954
1 parent cdb02ab
commit e261954
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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. */