Pull netlink into release branch

[linux-2.6-omap-h63xx.git] / include / linux / netfilter_ipv6 / ip6t_esp.h

diff --git a/include/linux/netfilter_ipv6/ip6t_esp.h b/include/linux/netfilter_ipv6/ip6t_esp.h
index a91b6abc8079e37a56d5713af4a9fc5cedce8c38..f62eaf53c16cbe5b5f6bf1783ba3ffcb248e53d4 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6t_esp.h
+++ b/include/linux/netfilter_ipv6/ip6t_esp.h
@@ -1,14 +1,10 @@
 #ifndef _IP6T_ESP_H
 #define _IP6T_ESP_H
 
-struct ip6t_esp
-{
-       u_int32_t spis[2];                      /* Security Parameter Index */
-       u_int8_t  invflags;                     /* Inverse flags */
-};
+#include <linux/netfilter/xt_esp.h>
 
-/* Values for "invflags" field in struct ip6t_esp. */
-#define IP6T_ESP_INV_SPI               0x01    /* Invert the sense of spi. */
-#define IP6T_ESP_INV_MASK      0x01    /* All possible flags. */
+#define ip6t_esp xt_esp
+#define IP6T_ESP_INV_SPI       XT_ESP_INV_SPI
+#define IP6T_ESP_INV_MASK      XT_ESP_INV_MASK
 
 #endif /*_IP6T_ESP_H*/