Merge branch 'x86/gart' into x86/core

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

diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c
index 21d29e782baf3ae0970efac12e8587b934fa1f47..cbf2e27a22b298c0d3d818b3b1e85f398b259984 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_sctp.c
+++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -25,7 +25,7 @@
 #include <net/netfilter/nf_conntrack_l4proto.h>
 #include <net/netfilter/nf_conntrack_ecache.h>
 
-/* Protects conntrack->proto.sctp */
+/* Protects ct->proto.sctp */
 static DEFINE_RWLOCK(sctp_lock);
 
 /* FIXME: Examine ipfilter's timeouts and conntrack transitions more
@@ -33,7 +33,7 @@ static DEFINE_RWLOCK(sctp_lock);
 
    And so for me for SCTP :D -Kiran */
 
-static const char *sctp_conntrack_names[] = {
+static const char *const sctp_conntrack_names[] = {
        "NONE",
        "CLOSED",
        "COOKIE_WAIT",
@@ -130,28 +130,28 @@ static const u8 sctp_conntracks[2][9][SCTP_CONNTRACK_MAX] = {
        }
 };
 
-static int sctp_pkt_to_tuple(const struct sk_buff *skb,
-                            unsigned int dataoff,
-                            struct nf_conntrack_tuple *tuple)
+static bool sctp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,
+                             struct nf_conntrack_tuple *tuple)
 {
-       sctp_sctphdr_t _hdr, *hp;
+       const struct sctphdr *hp;
+       struct sctphdr _hdr;
 
        /* Actually only need first 8 bytes. */
        hp = skb_header_pointer(skb, dataoff, 8, &_hdr);
        if (hp == NULL)
-               return 0;
+               return false;
 
        tuple->src.u.sctp.port = hp->source;
        tuple->dst.u.sctp.port = hp->dest;
-       return 1;
+       return true;
 }
 
-static int sctp_invert_tuple(struct nf_conntrack_tuple *tuple,
-                            const struct nf_conntrack_tuple *orig)
+static bool sctp_invert_tuple(struct nf_conntrack_tuple *tuple,
+                             const struct nf_conntrack_tuple *orig)
 {
        tuple->src.u.sctp.port = orig->dst.u.sctp.port;
        tuple->dst.u.sctp.port = orig->src.u.sctp.port;
-       return 1;
+       return true;
 }
 
 /* Print out the per-protocol part of the tuple. */
@@ -292,8 +292,10 @@ static int sctp_packet(struct nf_conn *ct,
 {
        enum sctp_conntrack new_state, old_state;
        enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
-       sctp_sctphdr_t _sctph, *sh;
-       sctp_chunkhdr_t _sch, *sch;
+       const struct sctphdr *sh;
+       struct sctphdr _sctph;
+       const struct sctp_chunkhdr *sch;
+       struct sctp_chunkhdr _sch;
        u_int32_t offset, count;
        unsigned long map[256 / sizeof(unsigned long)] = { 0 };
 
@@ -390,27 +392,29 @@ out:
 }
 
 /* Called when a new connection for this protocol found. */
-static int sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
-                   unsigned int dataoff)
+static bool sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
+                    unsigned int dataoff)
 {
        enum sctp_conntrack new_state;
-       sctp_sctphdr_t _sctph, *sh;
-       sctp_chunkhdr_t _sch, *sch;
+       const struct sctphdr *sh;
+       struct sctphdr _sctph;
+       const struct sctp_chunkhdr *sch;
+       struct sctp_chunkhdr _sch;
        u_int32_t offset, count;
        unsigned long map[256 / sizeof(unsigned long)] = { 0 };
 
        sh = skb_header_pointer(skb, dataoff, sizeof(_sctph), &_sctph);
        if (sh == NULL)
-               return 0;
+               return false;
 
        if (do_basic_checks(ct, skb, dataoff, map) != 0)
-               return 0;
+               return false;
 
        /* If an OOTB packet has any of these chunks discard (Sec 8.4) */
        if (test_bit(SCTP_CID_ABORT, map) ||
            test_bit(SCTP_CID_SHUTDOWN_COMPLETE, map) ||
            test_bit(SCTP_CID_COOKIE_ACK, map))
-               return 0;
+               return false;
 
        new_state = SCTP_CONNTRACK_MAX;
        for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) {
@@ -422,7 +426,7 @@ static int sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
                if (new_state == SCTP_CONNTRACK_NONE ||
                    new_state == SCTP_CONNTRACK_MAX) {
                        pr_debug("nf_conntrack_sctp: invalid new deleting.\n");
-                       return 0;
+                       return false;
                }
 
                /* Copy the vtag into the state info */
@@ -433,7 +437,7 @@ static int sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
                                ih = skb_header_pointer(skb, offset + sizeof(sctp_chunkhdr_t),
                                                        sizeof(_inithdr), &_inithdr);
                                if (ih == NULL)
-                                       return 0;
+                                       return false;
 
                                pr_debug("Setting vtag %x for new conn\n",
                                         ih->init_tag);
@@ -442,7 +446,7 @@ static int sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
                                                                ih->init_tag;
                        } else {
                                /* Sec 8.5.1 (A) */
-                               return 0;
+                               return false;
                        }
                }
                /* If it is a shutdown ack OOTB packet, we expect a return
@@ -456,7 +460,7 @@ static int sctp_new(struct nf_conn *ct, const struct sk_buff *skb,
                ct->proto.sctp.state = new_state;
        }
 
-       return 1;
+       return true;
 }
 
 #ifdef CONFIG_SYSCTL
@@ -624,7 +628,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6 __read_mostly = {
 #endif
 };
 
-int __init nf_conntrack_proto_sctp_init(void)
+static int __init nf_conntrack_proto_sctp_init(void)
 {
        int ret;
 
@@ -647,7 +651,7 @@ int __init nf_conntrack_proto_sctp_init(void)
        return ret;
 }
 
-void __exit nf_conntrack_proto_sctp_fini(void)
+static void __exit nf_conntrack_proto_sctp_fini(void)
 {
        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp6);
        nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_sctp4);