initramfs: fix initramfs size calculation

[linux-drm-fsl-dcu.git] / net / netfilter / nf_conntrack_l3proto_generic.c

diff --git a/net/netfilter/nf_conntrack_l3proto_generic.c b/net/netfilter/nf_conntrack_l3proto_generic.c
index b1bfa207a850d7fcd61d0faadf4fc91caffc7255..e7eb807fe07d0950d21342113fa9d8a326b97fcf 100644 (file)
--- a/net/netfilter/nf_conntrack_l3proto_generic.c
+++ b/net/netfilter/nf_conntrack_l3proto_generic.c
@@ -31,22 +31,22 @@
 #include <net/netfilter/nf_conntrack_core.h>
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
 
-static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
-                               struct nf_conntrack_tuple *tuple)
+static bool generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
+                                struct nf_conntrack_tuple *tuple)
 {
        memset(&tuple->src.u3, 0, sizeof(tuple->src.u3));
        memset(&tuple->dst.u3, 0, sizeof(tuple->dst.u3));
 
-       return 1;
+       return true;
 }
 
-static int generic_invert_tuple(struct nf_conntrack_tuple *tuple,
-                          const struct nf_conntrack_tuple *orig)
+static bool generic_invert_tuple(struct nf_conntrack_tuple *tuple,
+                                const struct nf_conntrack_tuple *orig)
 {
        memset(&tuple->src.u3, 0, sizeof(tuple->src.u3));
        memset(&tuple->dst.u3, 0, sizeof(tuple->dst.u3));
 
-       return 1;
+       return true;
 }
 
 static int generic_print_tuple(struct seq_file *s,
@@ -55,28 +55,20 @@ static int generic_print_tuple(struct seq_file *s,
        return 0;
 }
 
-static int generic_print_conntrack(struct seq_file *s,
-                               const struct nf_conn *conntrack)
-{
-       return 0;
-}
-
-static int
-generic_prepare(struct sk_buff **pskb, unsigned int hooknum,
-               unsigned int *dataoff, u_int8_t *protonum)
+static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff,
+                              unsigned int *dataoff, u_int8_t *protonum)
 {
        /* Never track !!! */
        return -NF_ACCEPT;
 }
 
 
-struct nf_conntrack_l3proto nf_conntrack_l3proto_generic = {
+struct nf_conntrack_l3proto nf_conntrack_l3proto_generic __read_mostly = {
        .l3proto         = PF_UNSPEC,
        .name            = "unknown",
        .pkt_to_tuple    = generic_pkt_to_tuple,
        .invert_tuple    = generic_invert_tuple,
        .print_tuple     = generic_print_tuple,
-       .print_conntrack = generic_print_conntrack,
-       .prepare         = generic_prepare,
+       .get_l4proto     = generic_get_l4proto,
 };
 EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic);