microblaze: uaccess: fix put_user and get_user macros
[linux-2.6.git] / net / bridge / netfilter / ebt_ip6.c
index 1230c9e..bbf2534 100644 (file)
@@ -27,12 +27,10 @@ struct tcpudphdr {
        __be16 dst;
 };
 
-static int ebt_filter_ip6(const struct sk_buff *skb,
-   const struct net_device *in,
-   const struct net_device *out, const void *data,
-   unsigned int datalen)
+static bool
+ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct ebt_ip6_info *info = (struct ebt_ip6_info *)data;
+       const struct ebt_ip6_info *info = par->matchinfo;
        const struct ipv6hdr *ih6;
        struct ipv6hdr _ip6h;
        const struct tcpudphdr *pptr;
@@ -42,60 +40,60 @@ static int ebt_filter_ip6(const struct sk_buff *skb,
 
        ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h);
        if (ih6 == NULL)
-               return EBT_NOMATCH;
+               return false;
        if (info->bitmask & EBT_IP6_TCLASS &&
           FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))
-               return EBT_NOMATCH;
+               return false;
        for (i = 0; i < 4; i++)
                tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] &
                        info->smsk.in6_u.u6_addr32[i];
        if (info->bitmask & EBT_IP6_SOURCE &&
                FWINV((ipv6_addr_cmp(&tmp_addr, &info->saddr) != 0),
                        EBT_IP6_SOURCE))
-               return EBT_NOMATCH;
+               return false;
        for (i = 0; i < 4; i++)
                tmp_addr.in6_u.u6_addr32[i] = ih6->daddr.in6_u.u6_addr32[i] &
                        info->dmsk.in6_u.u6_addr32[i];
        if (info->bitmask & EBT_IP6_DEST &&
           FWINV((ipv6_addr_cmp(&tmp_addr, &info->daddr) != 0), EBT_IP6_DEST))
-               return EBT_NOMATCH;
+               return false;
        if (info->bitmask & EBT_IP6_PROTO) {
                uint8_t nexthdr = ih6->nexthdr;
                int offset_ph;
 
                offset_ph = ipv6_skip_exthdr(skb, sizeof(_ip6h), &nexthdr);
                if (offset_ph == -1)
-                       return EBT_NOMATCH;
+                       return false;
                if (FWINV(info->protocol != nexthdr, EBT_IP6_PROTO))
-                       return EBT_NOMATCH;
+                       return false;
                if (!(info->bitmask & EBT_IP6_DPORT) &&
                    !(info->bitmask & EBT_IP6_SPORT))
-                       return EBT_MATCH;
+                       return true;
                pptr = skb_header_pointer(skb, offset_ph, sizeof(_ports),
                                          &_ports);
                if (pptr == NULL)
-                       return EBT_NOMATCH;
+                       return false;
                if (info->bitmask & EBT_IP6_DPORT) {
                        u32 dst = ntohs(pptr->dst);
                        if (FWINV(dst < info->dport[0] ||
                                  dst > info->dport[1], EBT_IP6_DPORT))
-                               return EBT_NOMATCH;
+                               return false;
                }
                if (info->bitmask & EBT_IP6_SPORT) {
                        u32 src = ntohs(pptr->src);
                        if (FWINV(src < info->sport[0] ||
                                  src > info->sport[1], EBT_IP6_SPORT))
-                       return EBT_NOMATCH;
+                       return false;
                }
-               return EBT_MATCH;
+               return true;
        }
-       return EBT_MATCH;
+       return true;
 }
 
-static bool ebt_ip6_check(const char *tablename, unsigned int hookmask,
-   const struct ebt_entry *e, void *data, unsigned int datalen)
+static bool ebt_ip6_mt_check(const struct xt_mtchk_param *par)
 {
-       struct ebt_ip6_info *info = (struct ebt_ip6_info *)data;
+       const struct ebt_entry *e = par->entryinfo;
+       struct ebt_ip6_info *info = par->matchinfo;
 
        if (e->ethproto != htons(ETH_P_IPV6) || e->invflags & EBT_IPROTO)
                return false;
@@ -118,23 +116,24 @@ static bool ebt_ip6_check(const char *tablename, unsigned int hookmask,
        return true;
 }
 
-static struct ebt_match filter_ip6 =
-{
-       .name           = EBT_IP6_MATCH,
-       .match          = ebt_filter_ip6,
-       .check          = ebt_ip6_check,
-       .matchsize      = XT_ALIGN(sizeof(struct ebt_ip6_info)),
+static struct xt_match ebt_ip6_mt_reg __read_mostly = {
+       .name           = "ip6",
+       .revision       = 0,
+       .family         = NFPROTO_BRIDGE,
+       .match          = ebt_ip6_mt,
+       .checkentry     = ebt_ip6_mt_check,
+       .matchsize      = sizeof(struct ebt_ip6_info),
        .me             = THIS_MODULE,
 };
 
 static int __init ebt_ip6_init(void)
 {
-       return ebt_register_match(&filter_ip6);
+       return xt_register_match(&ebt_ip6_mt_reg);
 }
 
 static void __exit ebt_ip6_fini(void)
 {
-       ebt_unregister_match(&filter_ip6);
+       xt_unregister_match(&ebt_ip6_mt_reg);
 }
 
 module_init(ebt_ip6_init);