[NETFILTER]: NAT annotations

[linux-2.6-omap-h63xx.git] / net / ipv4 / netfilter / ipt_MASQUERADE.c

diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c
index ebd94f2abf0d49674d8ba6d74e34dff475eb7588..3dbfcfac8a84db1b46543ebec8ba58865d12edf0 100644 (file)
--- a/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -42,7 +42,6 @@ masquerade_check(const char *tablename,
                 const void *e,
                 const struct xt_target *target,
                 void *targinfo,
-                unsigned int targinfosize,
                 unsigned int hook_mask)
 {
        const struct ip_nat_multi_range_compat *mr = targinfo;
@@ -64,15 +63,14 @@ masquerade_target(struct sk_buff **pskb,
                  const struct net_device *out,
                  unsigned int hooknum,
                  const struct xt_target *target,
-                 const void *targinfo,
-                 void *userinfo)
+                 const void *targinfo)
 {
        struct ip_conntrack *ct;
        enum ip_conntrack_info ctinfo;
        const struct ip_nat_multi_range_compat *mr;
        struct ip_nat_range newrange;
        struct rtable *rt;
-       u_int32_t newsrc;
+       __be32 newsrc;
 
        IP_NF_ASSERT(hooknum == NF_IP_POST_ROUTING);