Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / include / linux / netfilter_ipv4 / ip_nat.h

diff --git a/include/linux/netfilter_ipv4/ip_nat.h b/include/linux/netfilter_ipv4/ip_nat.h
index e201ec6e990550004d03cb60c10ad07b96892882..e9f5ed1d9f680f4b32de4c01d26ed50089ec9983 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_nat.h
+++ b/include/linux/netfilter_ipv4/ip_nat.h
@@ -23,7 +23,7 @@ struct ip_nat_seq {
         * modification (if any) */
        u_int32_t correction_pos;
        /* sequence number offset before and after last modification */
-       int32_t offset_before, offset_after;
+       int16_t offset_before, offset_after;
 };
 
 /* Single range specification. */
@@ -58,10 +58,6 @@ extern rwlock_t ip_nat_lock;
 struct ip_nat_info
 {
        struct list_head bysource;
-
-       /* Helper (NULL if none). */
-       struct ip_nat_helper *helper;
-
        struct ip_nat_seq seq[IP_CT_DIR_MAX];
 };