Merge branch 'nfs-server-stable' of git://linux-nfs.org/~bfields/linux

[mv-sheeva.git] / net / netfilter / xt_pkttype.c

diff --git a/net/netfilter/xt_pkttype.c b/net/netfilter/xt_pkttype.c
index 63239727bc22467368efab410ec361980edb4756..a52925f12f35e58ec25188130e63be13edf623a4 100644 (file)
--- a/net/netfilter/xt_pkttype.c
+++ b/net/netfilter/xt_pkttype.c
@@ -34,16 +34,16 @@ static bool match(const struct sk_buff *skb,
        const struct xt_pkttype_info *info = matchinfo;
 
        if (skb->pkt_type == PACKET_LOOPBACK)
-               type = (MULTICAST(ip_hdr(skb)->daddr)
+               type = MULTICAST(ip_hdr(skb)->daddr)
                        ? PACKET_MULTICAST
-                       : PACKET_BROADCAST);
+                       : PACKET_BROADCAST;
        else
                type = skb->pkt_type;
 
        return (type == info->pkttype) ^ info->invert;
 }
 
-static struct xt_match xt_pkttype_match[] = {
+static struct xt_match xt_pkttype_match[] __read_mostly = {
        {
                .name           = "pkttype",
                .family         = AF_INET,