update kernel headers to 3.19-rc1

diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index 6b4eb66d445316af391ecc05becb95a0f17b728b..19ff22af9f8e5027764576108cb95f95748df657 100644 (file)
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -105,7 +105,7 @@ struct __fdb_entry {
 
 #define BRIDGE_MODE_VEB                0       /* Default loopback mode */
 #define BRIDGE_MODE_VEPA       1       /* 802.1Qbg defined VEPA mode */
-#define BRIDGE_MODE_SWDEV      2       /* Full switch device offload */
+#define BRIDGE_MODE_UNDEF      0xFFFF  /* mode undefined */
 
 /* Bridge management nested attributes
  * [IFLA_AF_SPEC] = {

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 75cc8ace88756283a8f19a2b830e9133e82564c4..ffee58397eaa7a94da2f943ce97e3417de8f766d 100644 (file)
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -22,21 +22,11 @@
 
 /* Read queue size */
 #define TUN_READQ_SIZE 500
-
-/* TUN device flags */
-#define TUN_TUN_DEV    0x0001  
-#define TUN_TAP_DEV    0x0002
+/* TUN device type flags: deprecated. Use IFF_TUN/IFF_TAP instead. */
+#define TUN_TUN_DEV    IFF_TUN
+#define TUN_TAP_DEV    IFF_TAP
 #define TUN_TYPE_MASK   0x000f
 
-#define TUN_FASYNC     0x0010
-#define TUN_NOCHECKSUM 0x0020
-#define TUN_NO_PI      0x0040
-/* This flag has no real effect */
-#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) 
 #define TUNSETDEBUG   _IOW('T', 201, int) 
@@ -58,6 +48,8 @@
 #define TUNSETQUEUE  _IOW('T', 217, int)
 #define TUNSETIFINDEX  _IOW('T', 218, unsigned int)
 #define TUNGETFILTER _IOR('T', 219, struct sock_fprog)
+#define TUNSETVNETLE _IOW('T', 220, int)
+#define TUNGETVNETLE _IOR('T', 221, int)
 
 /* TUNSETIFF ifr flags */
 #define IFF_TUN                0x0001