diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 01:35:23 -0400 |
| commit | e1ec1b8ccdf0df6000faa8c2d985ca5f94157e5a (patch) | |
| tree | 4e1ca325dde22f1ac21c9da0be509e87e922e604 /net/ipv6/ip6_input.c | |
| parent | c0f39322c335412339dec16ebfd2a05ceba5ebcf (diff) | |
| parent | 802fb176d8c635ae42da31b80841c26e8c7338a0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/s2io.c
Diffstat (limited to 'net/ipv6/ip6_input.c')
| -rw-r--r-- | net/ipv6/ip6_input.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 7e36269826ba..43a617e2268b 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c | |||
| @@ -234,8 +234,7 @@ int ip6_mc_input(struct sk_buff *skb) | |||
| 234 | IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS); | 234 | IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS); |
| 235 | 235 | ||
| 236 | hdr = ipv6_hdr(skb); | 236 | hdr = ipv6_hdr(skb); |
| 237 | deliver = unlikely(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI)) || | 237 | deliver = ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); |
| 238 | ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL); | ||
| 239 | 238 | ||
| 240 | /* | 239 | /* |
| 241 | * IPv6 multicast router mode isnt currently supported. | 240 | * IPv6 multicast router mode isnt currently supported. |