cpumask: statement expressions confuse some versions of gcc

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

diff --git a/net/netfilter/xt_sctp.c b/net/netfilter/xt_sctp.c
index 3358273a47b78f6567396de97619dab08a403ec6..e6e4681fa047987b88c249b8b0ba5fd6b174343c 100644 (file)
--- a/net/netfilter/xt_sctp.c
+++ b/net/netfilter/xt_sctp.c
@@ -11,7 +11,7 @@
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Kiran Kumar Immidi");
-MODULE_DESCRIPTION("Match for SCTP protocol packets");
+MODULE_DESCRIPTION("Xtables: SCTP protocol packet match");
 MODULE_ALIAS("ipt_sctp");
 MODULE_ALIAS("ip6t_sctp");
 
@@ -46,7 +46,8 @@ match_packet(const struct sk_buff *skb,
             bool *hotdrop)
 {
        u_int32_t chunkmapcopy[256 / sizeof (u_int32_t)];
-       sctp_chunkhdr_t _sch, *sch;
+       const sctp_chunkhdr_t *sch;
+       sctp_chunkhdr_t _sch;
        int chunk_match_type = info->chunk_match_type;
        const struct xt_sctp_flag_info *flag_info = info->flag_info;
        int flag_count = info->flag_count;
@@ -116,17 +117,13 @@ match_packet(const struct sk_buff *skb,
 }
 
 static bool
-match(const struct sk_buff *skb,
-      const struct net_device *in,
-      const struct net_device *out,
-      const struct xt_match *match,
-      const void *matchinfo,
-      int offset,
-      unsigned int protoff,
-      bool *hotdrop)
+sctp_mt(const struct sk_buff *skb, const struct net_device *in,
+        const struct net_device *out, const struct xt_match *match,
+        const void *matchinfo, int offset, unsigned int protoff, bool *hotdrop)
 {
        const struct xt_sctp_info *info = matchinfo;
-       sctp_sctphdr_t _sh, *sh;
+       const sctp_sctphdr_t *sh;
+       sctp_sctphdr_t _sh;
 
        if (offset) {
                duprintf("Dropping non-first fragment.. FIXME\n");
@@ -153,11 +150,9 @@ match(const struct sk_buff *skb,
 }
 
 static bool
-checkentry(const char *tablename,
-          const void *inf,
-          const struct xt_match *match,
-          void *matchinfo,
-          unsigned int hook_mask)
+sctp_mt_check(const char *tablename, const void *inf,
+              const struct xt_match *match, void *matchinfo,
+              unsigned int hook_mask)
 {
        const struct xt_sctp_info *info = matchinfo;
 
@@ -171,12 +166,12 @@ checkentry(const char *tablename,
                                | SCTP_CHUNK_MATCH_ONLY)));
 }
 
-static struct xt_match xt_sctp_match[] __read_mostly = {
+static struct xt_match sctp_mt_reg[] __read_mostly = {
        {
                .name           = "sctp",
                .family         = AF_INET,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = sctp_mt_check,
+               .match          = sctp_mt,
                .matchsize      = sizeof(struct xt_sctp_info),
                .proto          = IPPROTO_SCTP,
                .me             = THIS_MODULE
@@ -184,23 +179,23 @@ static struct xt_match xt_sctp_match[] __read_mostly = {
        {
                .name           = "sctp",
                .family         = AF_INET6,
-               .checkentry     = checkentry,
-               .match          = match,
+               .checkentry     = sctp_mt_check,
+               .match          = sctp_mt,
                .matchsize      = sizeof(struct xt_sctp_info),
                .proto          = IPPROTO_SCTP,
                .me             = THIS_MODULE
        },
 };
 
-static int __init xt_sctp_init(void)
+static int __init sctp_mt_init(void)
 {
-       return xt_register_matches(xt_sctp_match, ARRAY_SIZE(xt_sctp_match));
+       return xt_register_matches(sctp_mt_reg, ARRAY_SIZE(sctp_mt_reg));
 }
 
-static void __exit xt_sctp_fini(void)
+static void __exit sctp_mt_exit(void)
 {
-       xt_unregister_matches(xt_sctp_match, ARRAY_SIZE(xt_sctp_match));
+       xt_unregister_matches(sctp_mt_reg, ARRAY_SIZE(sctp_mt_reg));
 }
 
-module_init(xt_sctp_init);
-module_exit(xt_sctp_fini);
+module_init(sctp_mt_init);
+module_exit(sctp_mt_exit);