Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/net/ipv4/netfilter/ip_nat_proto_unknown.c b/net/ipv4/netfilter/ip_nat_proto_unknown.c
index 2d42a00..3bf0495 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_proto_unknown.c
+++ b/net/ipv4/netfilter/ip_nat_proto_unknown.c
@@ -39,32 +39,17 @@ static int unknown_unique_tuple(struct ip_conntrack_tuple *tuple,
 
 static int
 unknown_manip_pkt(struct sk_buff **pskb,
-                 unsigned int hdroff,
-                 const struct ip_conntrack_manip *manip,
+                 unsigned int iphdroff,
+                 const struct ip_conntrack_tuple *tuple,
                  enum ip_nat_manip_type maniptype)
 {
        return 1;
 }
 
-static unsigned int
-unknown_print(char *buffer,
-             const struct ip_conntrack_tuple *match,
-             const struct ip_conntrack_tuple *mask)
-{
-       return 0;
-}
-
-static unsigned int
-unknown_print_range(char *buffer, const struct ip_nat_range *range)
-{
-       return 0;
-}
-
-struct ip_nat_protocol unknown_nat_protocol = {
-       { NULL, NULL }, "unknown", 0,
-       unknown_manip_pkt,
-       unknown_in_range,
-       unknown_unique_tuple,
-       unknown_print,
-       unknown_print_range
+struct ip_nat_protocol ip_nat_unknown_protocol = {
+       .name                   = "unknown",
+       /* .me isn't set: getting a ref to this cannot fail. */
+       .manip_pkt              = unknown_manip_pkt,
+       .in_range               = unknown_in_range,
+       .unique_tuple           = unknown_unique_tuple,
 };