]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IPV6]: Reverse sense of promisc tests in ip6_mc_input
authorCorey Mutter <crm-netdev@mutternet.com>
Mon, 14 May 2007 10:00:27 +0000 (03:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 May 2007 10:00:27 +0000 (03:00 -0700)
Reverse the sense of the promiscuous-mode tests in ip6_mc_input().

Signed-off-by: Corey Mutter <crm-netdev@mutternet.com>
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_input.c

index be0ee8a34f9bd379a3e23d53099299e8ff6beea5..30a5cb1b203e1e644c0e3182692b91549c9c9725 100644 (file)
@@ -235,7 +235,7 @@ int ip6_mc_input(struct sk_buff *skb)
        IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS);
 
        hdr = ipv6_hdr(skb);
-       deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) ||
+       deliver = unlikely(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI)) ||
            ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL);
 
        /*