---

yaml --- r: 199457 b: refs/heads/master c: 6057fd7 h: refs/heads/master i: 199455: 8eceaf5 v: v3
git-mirror · May 29, 2010 · 64191ed · 64191ed
1 parent 60b686e
commit 64191ed
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: e5e5cf4c71508ed38e921b31b438b8b349409f2a
+refs/heads/master: 6057fd78a8dcce6269f029b967051d5a2e9b0895
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
@@ -814,7 +814,7 @@ struct dst_entry * ip6_route_output(struct net *net, struct sock *sk,
 {
 	int flags = 0;
 
-	if (fl->oif || rt6_need_strict(&fl->fl6_dst))
+	if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl->fl6_dst))
 		flags |= RT6_LOOKUP_F_IFACE;
 
 	if (!ipv6_addr_any(&fl->fl6_src))