vserver 1.9.5.x5

[linux-2.6.git] / net / ipv4 / netfilter / ipt_REDIRECT.c

diff --git a/net/ipv4/netfilter/ipt_REDIRECT.c b/net/ipv4/netfilter/ipt_REDIRECT.c
index 15232f5..d2e1344 100644 (file)
--- a/net/ipv4/netfilter/ipt_REDIRECT.c
+++ b/net/ipv4/netfilter/ipt_REDIRECT.c
@@ -38,7 +38,7 @@ redirect_check(const char *tablename,
               unsigned int targinfosize,
               unsigned int hook_mask)
 {
-       const struct ip_nat_multi_range *mr = targinfo;
+       const struct ip_nat_multi_range_compat *mr = targinfo;
 
        if (strcmp(tablename, "nat") != 0) {
                DEBUGP("redirect_check: bad table `%s'.\n", table);
@@ -74,8 +74,8 @@ redirect_target(struct sk_buff **pskb,
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
        u_int32_t newdst;
-       const struct ip_nat_multi_range *mr = targinfo;
-       struct ip_nat_multi_range newrange;
+       const struct ip_nat_multi_range_compat *mr = targinfo;
+       struct ip_nat_range newrange;
 
        IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING
                     || hooknum == NF_IP_LOCAL_OUT);
@@ -99,10 +99,10 @@ redirect_target(struct sk_buff **pskb,
        }
 
        /* Transfer from original range. */
-       newrange = ((struct ip_nat_multi_range)
-               { 1, { { mr->range[0].flags | IP_NAT_RANGE_MAP_IPS,
-                        newdst, newdst,
-                        mr->range[0].min, mr->range[0].max } } });
+       newrange = ((struct ip_nat_range)
+               { mr->range[0].flags | IP_NAT_RANGE_MAP_IPS,
+                 newdst, newdst,
+                 mr->range[0].min, mr->range[0].max });
 
        /* Hand modified range to generic setup. */
        return ip_nat_setup_info(ct, &newrange, hooknum);