---

yaml --- r: 190238 b: refs/heads/master c: f4f914b h: refs/heads/master v: v3
git-mirror · Apr 22, 2010 · 345c970 · 345c970
1 parent c04849f
commit 345c970
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2228f785a9d97307aa8ba709088cfda6c3df73f
+refs/heads/master: f4f914b58019f0e50d521bbbadfaee260d766f95
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -815,7 +815,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
 {
 	int flags = 0;
 
-	if (rt6_need_strict(&fl->fl6_dst))
+	if (fl->oif || rt6_need_strict(&fl->fl6_dst))
 		flags |= RT6_LOOKUP_F_IFACE;
 
 	if (!ipv6_addr_any(&fl->fl6_src))