Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/include/linux/netfilter_ipv4/ip_nat_protocol.h b/include/linux/netfilter_ipv4/ip_nat_protocol.h
index ef63aa991a0669ffd02843ca332dc267b81c427c..612a43614e7ba659ed3f103b5f4f2e67ef658c48 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_nat_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_nat_protocol.h
@@ -42,13 +42,6 @@ struct ip_nat_protocol
                            enum ip_nat_manip_type maniptype,
                            const struct ip_conntrack *conntrack);
 
-       unsigned int (*print)(char *buffer,
-                             const struct ip_conntrack_tuple *match,
-                             const struct ip_conntrack_tuple *mask);
-
-       unsigned int (*print_range)(char *buffer,
-                                   const struct ip_nat_range *range);
-
        int (*range_to_nfattr)(struct sk_buff *skb,
                               const struct ip_nat_range *range);