Update to 2.6.34-rc2 headers

diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h
index 049d6c9428db60b78dbb49a595e774da001effb0..43d510e897751be17b64cd522e690467fb88f763 100644 (file)
--- a/include/linux/if_tun.h
+++ b/include/linux/if_tun.h
@@ -18,6 +18,7 @@
 
 #include <linux/types.h>
 #include <linux/if_ether.h>
+#include <linux/filter.h>
 
 /* Read queue size */
 #define TUN_READQ_SIZE 500
@@ -48,6 +49,8 @@
 #define TUNGETIFF      _IOR('T', 210, unsigned int)
 #define TUNGETSNDBUF   _IOR('T', 211, int)
 #define TUNSETSNDBUF   _IOW('T', 212, int)
+#define TUNATTACHFILTER _IOW('T', 213, struct sock_fprog)
+#define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
 
 /* TUNSETIFF ifr flags */
 #define IFF_TUN                0x0001
@@ -55,12 +58,14 @@
 #define IFF_NO_PI      0x1000
 #define IFF_ONE_QUEUE  0x2000
 #define IFF_VNET_HDR   0x4000
+#define IFF_TUN_EXCL   0x8000
 
 /* Features for GSO (TUNSETOFFLOAD). */
 #define TUN_F_CSUM     0x01    /* You can hand me unchecksummed packets. */
 #define TUN_F_TSO4     0x02    /* I can handle TSO for IPv4 packets */
 #define TUN_F_TSO6     0x04    /* I can handle TSO for IPv6 packets */
 #define TUN_F_TSO_ECN  0x08    /* I can handle TSO with ECN bits. */
+#define TUN_F_UFO      0x10    /* I can handle UFO packets */
 
 /* Protocol info prepended to the packets (when IFF_NO_PI is not set) */
 #define TUN_PKT_STRIP  0x0001

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 6c8d1d1ea119f78fa8ee10db4fa9419bdc61e812..8c819b8b357fd447e3f516f06f1ba2b883adb2c1 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -2,6 +2,7 @@
 #define _IF_TUNNEL_H_
 
 #include <linux/types.h>
+#include <asm/byteorder.h>
 
 
 #define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)