netfilter: xtables: move extension arguments into compound structure (5/6)

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

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index 7936f7e23254bcfdaf1a8a867f9bf9b41129c8a9..37753a377603de50c254c68383254005bb4924e7 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -23,20 +23,17 @@ MODULE_ALIAS("ipt_pkttype");
 MODULE_ALIAS("ip6t_pkttype");
 
 static bool
-pkttype_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)
+pkttype_mt(const struct sk_buff *skb, const struct xt_match_param *par)
 {
-       const struct xt_pkttype_info *info = matchinfo;
+       const struct xt_pkttype_info *info = par->matchinfo;
        u_int8_t type;
 
        if (skb->pkt_type != PACKET_LOOPBACK)
                type = skb->pkt_type;
-       else if (match->family == AF_INET &&
+       else if (par->match->family == NFPROTO_IPV4 &&
            ipv4_is_multicast(ip_hdr(skb)->daddr))
                type = PACKET_MULTICAST;
-       else if (match->family == AF_INET6 &&
+       else if (par->match->family == NFPROTO_IPV6 &&
            ipv6_hdr(skb)->daddr.s6_addr[0] == 0xFF)
                type = PACKET_MULTICAST;
        else
@@ -48,14 +45,14 @@ pkttype_mt(const struct sk_buff *skb, const struct net_device *in,
 static struct xt_match pkttype_mt_reg[] __read_mostly = {
        {
                .name           = "pkttype",
-               .family         = AF_INET,
+               .family         = NFPROTO_IPV4,
                .match          = pkttype_mt,
                .matchsize      = sizeof(struct xt_pkttype_info),
                .me             = THIS_MODULE,
        },
        {
                .name           = "pkttype",
-               .family         = AF_INET6,
+               .family         = NFPROTO_IPV6,
                .match          = pkttype_mt,
                .matchsize      = sizeof(struct xt_pkttype_info),
                .me             = THIS_MODULE,