Merge branch 'linux-2.6'

[linux-2.6] / include / linux / netfilter_ipv4 / ipt_esp.h

diff --git a/include/linux/netfilter_ipv4/ipt_esp.h b/include/linux/netfilter_ipv4/ipt_esp.h
index c782a83e53e0d472fe8ce3621df17dd9244d44b8..78296e7eeff98f729d60598662e5e0b650f6e9fd 100644 (file)
--- a/include/linux/netfilter_ipv4/ipt_esp.h
+++ b/include/linux/netfilter_ipv4/ipt_esp.h
@@ -1,16 +1,10 @@
 #ifndef _IPT_ESP_H
 #define _IPT_ESP_H
 
-struct ipt_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 ipt_esp. */
-#define IPT_ESP_INV_SPI                0x01    /* Invert the sense of spi. */
-#define IPT_ESP_INV_MASK       0x01    /* All possible flags. */
+#define ipt_esp xt_esp
+#define IPT_ESP_INV_SPI                XT_ESP_INV_SPI
+#define IPT_ESP_INV_MASK       XT_ESP_INV_MASK
 
 #endif /*_IPT_ESP_H*/