diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:49:13 -0400 |
| commit | e1703b36c358dde24ececba4fd609ecd91433ba3 (patch) | |
| tree | d59c333d0ad5bf72f165264eba6048c87fdc4e0f /net/ipv6/route.c | |
| parent | 7ec75c582e639d956ce3afd499f67febe6f902a4 (diff) | |
| parent | e95ef5d3f6bc60433883e1ef65dac747acd0bf1a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
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 c2438e8cb9d0..05ebd7833043 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -815,7 +815,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk, | |||
| 815 | { | 815 | { |
| 816 | int flags = 0; | 816 | int flags = 0; |
| 817 | 817 | ||
| 818 | if (rt6_need_strict(&fl->fl6_dst)) | 818 | if (fl->oif || rt6_need_strict(&fl->fl6_dst)) |
| 819 | flags |= RT6_LOOKUP_F_IFACE; | 819 | flags |= RT6_LOOKUP_F_IFACE; |
| 820 | 820 | ||
| 821 | if (!ipv6_addr_any(&fl->fl6_src)) | 821 | if (!ipv6_addr_any(&fl->fl6_src)) |