Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / include / net / netfilter / nf_nat_protocol.h

diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h
index a9ec5ef61468c7c35b6c2c3e89db8b9eb3c424fa..04578bfe23e17fbfa8791bc92dfb7a7bdd4c1b79 100644 (file)
--- a/include/net/netfilter/nf_nat_protocol.h
+++ b/include/net/netfilter/nf_nat_protocol.h
@@ -18,7 +18,7 @@ struct nf_nat_protocol
 
        /* Translate a packet to the target according to manip type.
           Return true if succeeded. */
-       int (*manip_pkt)(struct sk_buff **pskb,
+       int (*manip_pkt)(struct sk_buff *skb,
                         unsigned int iphdroff,
                         const struct nf_conntrack_tuple *tuple,
                         enum nf_nat_manip_type maniptype);
@@ -38,10 +38,10 @@ struct nf_nat_protocol
                            enum nf_nat_manip_type maniptype,
                            const struct nf_conn *ct);
 
-       int (*range_to_nfattr)(struct sk_buff *skb,
+       int (*range_to_nlattr)(struct sk_buff *skb,
                               const struct nf_nat_range *range);
 
-       int (*nfattr_to_range)(struct nfattr *tb[],
+       int (*nlattr_to_range)(struct nlattr *tb[],
                               struct nf_nat_range *range);
 };
 
@@ -62,9 +62,9 @@ extern int init_protocols(void) __init;
 extern void cleanup_protocols(void);
 extern struct nf_nat_protocol *find_nat_proto(u_int16_t protonum);
 
-extern int nf_nat_port_range_to_nfattr(struct sk_buff *skb,
+extern int nf_nat_port_range_to_nlattr(struct sk_buff *skb,
                                       const struct nf_nat_range *range);
-extern int nf_nat_port_nfattr_to_range(struct nfattr *tb[],
+extern int nf_nat_port_nlattr_to_range(struct nlattr *tb[],
                                       struct nf_nat_range *range);
 
 #endif /*_NF_NAT_PROTO_H*/