diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 14:27:28 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-31 14:27:28 +0100 |
| commit | 9f84653bbfba4f6c1bc7c0de914319bad55f17a4 (patch) | |
| tree | 0455f3e221d6128ba1efb68135c3fbe2c2c8b390 /net/ipv6/route.c | |
| parent | 3ac6cffea4aa18007a454a7442da2855882f403d (diff) | |
| parent | da2c0b021cde94866f1e492f940aad29e8f61258 (diff) | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index c4a59824ac2..9c574235c90 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -794,7 +794,7 @@ void ip6_route_input(struct sk_buff *skb) .proto = iph->nexthdr, }; - if (rt6_need_strict(&iph->daddr)) + if (rt6_need_strict(&iph->daddr) && skb->dev->type != ARPHRD_PIMREG) flags |= RT6_LOOKUP_F_IFACE; skb->dst = fib6_rule_lookup(net, &fl, flags, ip6_pol_route_input); |