commented early_printk patch because of rejects.

[linux-flexiantxendom0-3.2.10.git] / net / ipv4 / netfilter / ipt_esp.c

diff --git a/net/ipv4/netfilter/ipt_esp.c b/net/ipv4/netfilter/ipt_esp.c
index 1a52aae..0907173 100644 (file)
--- a/net/ipv4/netfilter/ipt_esp.c
+++ b/net/ipv4/netfilter/ipt_esp.c
@@ -1,6 +1,7 @@
 /* Kernel module to match ESP parameters. */
 #include <linux/module.h>
 #include <linux/skbuff.h>
+#include <linux/ip.h>
 
 #include <linux/netfilter_ipv4/ipt_esp.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
@@ -13,10 +14,6 @@ MODULE_LICENSE("GPL");
 #define duprintf(format, args...)
 #endif
 
-struct esphdr {
-       __u32   spi;
-};
-
 /* Returns 1 if the spi is matched by the range, 0 otherwise */
 static inline int
 spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
@@ -37,7 +34,7 @@ match(const struct sk_buff *skb,
       int offset,
       int *hotdrop)
 {
-       struct esphdr esp;
+       struct ip_esp_hdr esp;
        const struct ipt_esp *espinfo = matchinfo;
 
        /* Must not be a fragment. */