From 10b0e50c11d3c5e1d03507dc45ef6063683bef91 Mon Sep 17 00:00:00 2001 From: Corey Mutter Date: Mon, 14 May 2007 03:00:27 -0700 Subject: [PATCH] --- yaml --- r: 56376 b: refs/heads/master c: ae7bf20a6316272acfcaef5d265b18aaa54b41e4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ipv6/ip6_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 639bbe786a9f..faa71bbbc188 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e5c2d3bdbe2c047b9853c4248f881f5ac645c89 +refs/heads/master: ae7bf20a6316272acfcaef5d265b18aaa54b41e4 diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c index be0ee8a34f9b..30a5cb1b203e 100644 --- a/trunk/net/ipv6/ip6_input.c +++ b/trunk/net/ipv6/ip6_input.c @@ -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); /*